From ea91cf8239826b9e0103510cccd3270f8c8475a9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 23 Aug 2023 12:12:47 -0400 Subject: [PATCH] Switch OSP default to 17.1 * Update README and add RHEL versions table * Move telco examples to 17.1 * Add new example for 16.2 * Updade vars defaults and add some doc too for storage on RHEL9 * Skip some tasks in prepare_host for RHEL9 --- README.md | 10 +++++++- .../local-overrides-osp16-2-with-dpdk.yaml | 9 ------- ...=> local-overrides-osp17-1-with-dpdk.yaml} | 0 ...verrides-osp17-1-with-sriov-and-dpdk.yaml} | 0 ...> local-overrides-osp17-1-with-sriov.yaml} | 0 ...cal-overrides-rhel8_4-tripleo-osp16-2.yaml | 15 ++++++++++++ playbooks/prepare_host.yaml | 2 ++ playbooks/vars/defaults.yaml | 24 ++++++++++--------- 8 files changed, 39 insertions(+), 21 deletions(-) delete mode 100644 example-overrides/local-overrides-osp16-2-with-dpdk.yaml rename example-overrides/{local-overrides-osp16-2-with-pcipassthrough.yaml => local-overrides-osp17-1-with-dpdk.yaml} (100%) rename example-overrides/{local-overrides-osp16-2-with-sriov-and-dpdk.yaml => local-overrides-osp17-1-with-sriov-and-dpdk.yaml} (100%) rename example-overrides/{local-overrides-osp16-2-with-sriov.yaml => local-overrides-osp17-1-with-sriov.yaml} (100%) create mode 100644 example-overrides/local-overrides-rhel8_4-tripleo-osp16-2.yaml diff --git a/README.md b/README.md index c9d3976..8f42e0a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,15 @@ dev-install requires that: * the machine running dev-install can SSH to the standalone host as either root or a user with passwordless sudo access * this machine has Ansible installed, and some dependencies like python3-netaddr. -For OSP 16.2, the recommended OS is RHEL 8.4. For OSP 17, the recommended RHEL will be 9. +You need to deploy the right RHEL version depending on which OSP version you want: + +| OSP version | RHEL Version | +|--------------|--------------| +| 16.2 | 8.4 | +| 17.1* | 9.2 | + +> * Current default in dev-install + There is no need to do any other configuration prior to running dev-install. When deploying on TripleO from upstream, you need to deploy on CentOS Stream. If CentOS is not Stream, dev-install will migrate it. diff --git a/example-overrides/local-overrides-osp16-2-with-dpdk.yaml b/example-overrides/local-overrides-osp16-2-with-dpdk.yaml deleted file mode 100644 index a452699..0000000 --- a/example-overrides/local-overrides-osp16-2-with-dpdk.yaml +++ /dev/null @@ -1,9 +0,0 @@ -dpdk_interface: enp130s0f0 -kernel_args: "default_hugepagesz=1GB hugepagesz=1G hugepages=128 iommu=pt intel_iommu=on isolcpus=4-47" -tuned_isolated_cores: "4-47" -extra_heat_params: - NovaComputeCpuDedicatedSet: ['6-47'] - NovaReservedHostMemory: 4096 - NovaComputeCpuSharedSet: [0,1,2,3] - OvsDpdkSocketMemory: "4096,4096" - OvsPmdCoreList: "4,5" diff --git a/example-overrides/local-overrides-osp16-2-with-pcipassthrough.yaml b/example-overrides/local-overrides-osp17-1-with-dpdk.yaml similarity index 100% rename from example-overrides/local-overrides-osp16-2-with-pcipassthrough.yaml rename to example-overrides/local-overrides-osp17-1-with-dpdk.yaml diff --git a/example-overrides/local-overrides-osp16-2-with-sriov-and-dpdk.yaml b/example-overrides/local-overrides-osp17-1-with-sriov-and-dpdk.yaml similarity index 100% rename from example-overrides/local-overrides-osp16-2-with-sriov-and-dpdk.yaml rename to example-overrides/local-overrides-osp17-1-with-sriov-and-dpdk.yaml diff --git a/example-overrides/local-overrides-osp16-2-with-sriov.yaml b/example-overrides/local-overrides-osp17-1-with-sriov.yaml similarity index 100% rename from example-overrides/local-overrides-osp16-2-with-sriov.yaml rename to example-overrides/local-overrides-osp17-1-with-sriov.yaml diff --git a/example-overrides/local-overrides-rhel8_4-tripleo-osp16-2.yaml b/example-overrides/local-overrides-rhel8_4-tripleo-osp16-2.yaml new file mode 100644 index 0000000..c522404 --- /dev/null +++ b/example-overrides/local-overrides-rhel8_4-tripleo-osp16-2.yaml @@ -0,0 +1,15 @@ +standalone_host: +public_api: +virt_release: 8.4 +rhsm_repos: + - advanced-virt-for-rhel-8-x86_64-rpms + - ansible-2.9-for-rhel-8-x86_64-rpms + - fast-datapath-for-rhel-8-x86_64-rpms + - openstack-16.2-for-rhel-8-x86_64-rpms + - rhceph-4-tools-for-rhel-8-x86_64-rpms + - rhel-8-for-x86_64-appstream-eus-rpms + - rhel-8-for-x86_64-baseos-eus-rpms + - rhel-8-for-x86_64-highavailability-eus-rpms +rhsm_method: "portal" +rhsm_release: 8.4 +rhsm_container_tools_version: '3.0' diff --git a/playbooks/prepare_host.yaml b/playbooks/prepare_host.yaml index d76924c..129f436 100644 --- a/playbooks/prepare_host.yaml +++ b/playbooks/prepare_host.yaml @@ -41,10 +41,12 @@ ansible.builtin.shell: | dnf module disable -y container-tools:rhel8 dnf module enable -y container-tools:"{{ rhsm_container_tools_version }}" + when: ansible_distribution_major_version | int < 9 - name: Install virt module # noqa no-changed-when ansible.builtin.shell: | dnf module disable -y virt:rhel dnf module enable -y virt:"{{ virt_release }}" + when: ansible_distribution_major_version | int < 9 - name: Prepare host on RHEL system with rhos-release when: diff --git a/playbooks/vars/defaults.yaml b/playbooks/vars/defaults.yaml index edbeddd..72d6c81 100644 --- a/playbooks/vars/defaults.yaml +++ b/playbooks/vars/defaults.yaml @@ -1,5 +1,5 @@ --- -rhos_release: 16.2 +rhos_release: 17.1 hostname: standalone clouddomain: shiftstack @@ -133,8 +133,9 @@ tripleo_repos_repos: ceph_enabled: true # List of devices to use for ceph. If unset, we use a loop device instead. +# NOTE: on RHEL 9, this has to be a list of disk paths, and not /dev/sdX. # ceph_devices: -# - /dev/sdc +# - /dev/disk/by-path/pci-0000:45:00.0-ata-3 # Size of the loop device that will be # used for Ceph (in GB). @@ -207,16 +208,16 @@ rhsm_enabled: false # to false. rhsm_ephemeral: true rhsm_repos: - - advanced-virt-for-rhel-8-x86_64-rpms - - ansible-2.9-for-rhel-8-x86_64-rpms - - fast-datapath-for-rhel-8-x86_64-rpms - - openstack-16.2-for-rhel-8-x86_64-rpms - - rhceph-4-tools-for-rhel-8-x86_64-rpms - - rhel-8-for-x86_64-appstream-eus-rpms - - rhel-8-for-x86_64-baseos-eus-rpms - - rhel-8-for-x86_64-highavailability-eus-rpms + - rhel-9-for-x86_64-baseos-eus-rpms + - rhel-9-for-x86_64-appstream-eus-rpms + - rhel-9-for-x86_64-highavailability-eus-rpms + - openstack-17.1-for-rhel-9-x86_64-rpms + - fast-datapath-for-rhel-9-x86_64-rpms + - rhceph-6-tools-for-rhel-9-x86_64-rpms rhsm_method: "portal" -rhsm_release: 8.4 +rhsm_release: 9.2 +# Note: to install 16.1 on RHEL 8.2, you need rhsm_container_tools_version set to "2.0" +# For OSP 16.2 on RHEL 8.4, you need "3.0". rhsm_container_tools_version: '3.0' # Note: to install 16.1 on RHEL 8.2, you need virt_release set to "8.2" # For OSP 16.2 on RHEL 8.4, you need "av". @@ -233,6 +234,7 @@ dcn_services: # A list of block devices which will be combined and used as ephemeral local # storage +# NOTE: on RHEL 9, this has to be a list of disk paths, and not /dev/sdX. ephemeral_storage_devices: [] # Whether or not we want OVN to be enabled