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,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.
 

example-overrides/local-overrides-rhel8_4-tripleo-osp16-2.yaml

@@ -0,0 +1,15 @@
+standalone_host: <standalone FQDN>
+public_api: <IP address used to reach the node>
+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'

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:

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