From f2cc3bbfce52e8e119a2f55e23890b189b9a309d Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Mon, 12 Sep 2022 10:13:13 -0400 Subject: [PATCH] Add Rocky Linux 9 to zuul and docs * Fix up messaging in a couple of playbooks to describe Rocky as a supported install host Change-Id: Ief4023bab570836b41c6837a6abbbbcde2644bb3 --- deploy-guide/source/app-aboutosa.rst | 4 +- deploy-guide/source/deploymenthost.rst | 5 +- deploy-guide/source/overview-requirements.rst | 2 +- deploy-guide/source/targethosts-prepare.rst | 5 +- .../upgrades/os-compatibility-matrix.html | 28 +++++- doc/source/user/aio/quickstart.rst | 6 +- playbooks/openstack-hosts-setup.yml | 2 +- ...support-rockylinux-9-4b96b1ebb5f27f5f.yaml | 4 + scripts/bootstrap-ansible.sh | 5 +- .../tasks/check-requirements.yml | 4 +- zuul.d/jobs.yaml | 96 +++++++++++++++++++ zuul.d/project-templates.yaml | 17 ++++ 12 files changed, 162 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/support-rockylinux-9-4b96b1ebb5f27f5f.yaml diff --git a/deploy-guide/source/app-aboutosa.rst b/deploy-guide/source/app-aboutosa.rst index 788af994d4..1af807898c 100644 --- a/deploy-guide/source/app-aboutosa.rst +++ b/deploy-guide/source/app-aboutosa.rst @@ -6,7 +6,7 @@ About OpenStack-Ansible OpenStack-Ansible (OSA) uses the `Ansible `_ IT automation engine to deploy an OpenStack environment on Ubuntu, Debian -and CentOS. +and CentOS Stream (including derivatives like Rocky Linux) For isolation and ease of maintenance, all OpenStack services are installed by default from source code into python virtual environments. @@ -24,7 +24,7 @@ listed in our :dev_docs:`architecture reference `_ * `Debian 11 (Bullseye) LTS 64-bit `_ * `Centos 9 Stream 64-bit `_ +* `Rocky Linux 9 64-bit `_ Configure at least one network interface to access the Internet or suitable local repositories. @@ -64,8 +65,8 @@ Before you begin, we recommend upgrading your system packages and kernel. #. Configure NTP to synchronize with a suitable time source. -Configure CentOS -~~~~~~~~~~~~~~~~ +Configure CentOS / Rocky +~~~~~~~~~~~~~~~~~~~~~~~~ Install additional software packages and configure Network Time Protocol (NTP). Before you begin, we recommend upgrading your system packages and kernel. diff --git a/deploy-guide/source/overview-requirements.rst b/deploy-guide/source/overview-requirements.rst index 6491d6af4d..9bb570b1ab 100644 --- a/deploy-guide/source/overview-requirements.rst +++ b/deploy-guide/source/overview-requirements.rst @@ -24,7 +24,7 @@ following minimum requirements: * Centos 9 Stream - * Rocky Linux 8 + * Rocky Linux 9 * Linux kernel version ``3.10.0`` or later. diff --git a/deploy-guide/source/targethosts-prepare.rst b/deploy-guide/source/targethosts-prepare.rst index 348bcb5d20..dba79905b4 100644 --- a/deploy-guide/source/targethosts-prepare.rst +++ b/deploy-guide/source/targethosts-prepare.rst @@ -15,6 +15,7 @@ target host: * Ubuntu server 20.04 (Focal Fossa) LTS 64-bit * Debian 11 64-bit * Centos 9 Stream 64-bit +* Rocky Linux 9 64-bit Configure at least one network interface to access the Internet or suitable local repositories. @@ -90,8 +91,8 @@ Configure Ubuntu #. Reboot the host to activate the changes and use the new kernel. -Configure CentOS -~~~~~~~~~~~~~~~~ +Configure CentOS / Rocky +~~~~~~~~~~~~~~~~~~~~~~~~ #. Upgrade the system packages and kernel: diff --git a/doc/source/admin/upgrades/os-compatibility-matrix.html b/doc/source/admin/upgrades/os-compatibility-matrix.html index 3e801c8ccb..8570e919c8 100644 --- a/doc/source/admin/upgrades/os-compatibility-matrix.html +++ b/doc/source/admin/upgrades/os-compatibility-matrix.html @@ -8,22 +8,28 @@ Ubuntu CentOS Debian - Rocky Linux + Rocky Linux Suse + 16.04 18.04 20.04 22.04 + 7 8 8 Stream 9 Stream + 9 10 11 + 8 + 9 + 42 15 @@ -42,6 +48,7 @@ ✘ ✘ ✘ + ✘ ✔ ✘ @@ -60,6 +67,7 @@ ✘ ✘ ✘ + ✘ ✔ ✘ @@ -78,6 +86,7 @@ ✘ ✘ ✘ + ✘ ✔ ✘ @@ -95,6 +104,7 @@ ✘ ✘ ✘ + ✘ ✔ ✘ @@ -113,6 +123,7 @@ ✘ ✘ ✘ + ✘ ✔ ✔ @@ -130,6 +141,7 @@ ✘ ✘ ✘ + ✘ ✔ ✔ @@ -148,6 +160,7 @@ ✘ ✘ ✘ + ✘ ✘ ✔ @@ -165,6 +178,7 @@ ✘ ✘ ✘ + ✘ ✘ ✔ @@ -183,6 +197,7 @@ ✘ ✘ ✘ + ✘ ✘ ✔ @@ -200,6 +215,7 @@ ✘ ✘ ✘ + ✘ ✘ ✔ @@ -218,6 +234,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ @@ -235,6 +252,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ @@ -253,6 +271,7 @@ ✔ ✘ ✘ + ✘ ✘ ✘ @@ -270,6 +289,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ @@ -288,6 +308,7 @@ ✔ ✔ ✘ + ✘ ✘ ✘ @@ -305,6 +326,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ @@ -323,6 +345,7 @@ ✘ ✔ ✔ + ✘ ✘ ✘ @@ -340,6 +363,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ @@ -358,6 +382,7 @@ ✘ ✔ ✘ + ✔ ✘ ✘ @@ -375,6 +400,7 @@ ✘ ✘ ✘ + ✘ ✘ ✘ diff --git a/doc/source/user/aio/quickstart.rst b/doc/source/user/aio/quickstart.rst index fac2b2f2ac..6e3d2a76ed 100644 --- a/doc/source/user/aio/quickstart.rst +++ b/doc/source/user/aio/quickstart.rst @@ -69,7 +69,7 @@ system packages are upgraded and then reboot into the new kernel: .. code-block:: shell-session - ## CentOS + ## CentOS / Rocky Linux # dnf upgrade # dnf install git-core # systemctl stop firewalld @@ -81,7 +81,7 @@ system packages are upgraded and then reboot into the new kernel: Before rebooting, in ``/etc/sysconfig/selinux``, make sure that ``SELINUX=enforcing`` is changed to ``SELINUX=disabled``. SELinux enabled is not currently supported in OpenStack-Ansible - for CentOS/RHEL due to a lack of maintainers for the feature. + for CentOS/Rocky/RHEL due to a lack of maintainers for the feature. .. note:: @@ -121,7 +121,7 @@ version. .. note:: The |current_release_formal_name| release is only compatible with - Debian 11 (bullseye), Ubuntu 20.04 (Focal Fossa), CentOS 8 Stream, + Debian 11 (bullseye), Ubuntu 20.04 (Focal Fossa), CentOS 9 Stream, and derivitives of CentOS Stream/RHEL such as Rocky Linux. The next step is to bootstrap Ansible and the Ansible roles for the diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 10a0b39e2f..385995424a 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -59,7 +59,7 @@ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: > The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Jammy) and CentOS 9 Stream. + Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Jammy), CentOS 9 Stream, and Rocky Linux 9. roles: - role: "openstack_hosts" vars_files: diff --git a/releasenotes/notes/support-rockylinux-9-4b96b1ebb5f27f5f.yaml b/releasenotes/notes/support-rockylinux-9-4b96b1ebb5f27f5f.yaml new file mode 100644 index 0000000000..e61b655723 --- /dev/null +++ b/releasenotes/notes/support-rockylinux-9-4b96b1ebb5f27f5f.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Support Rocky Linux 9 as a Deployment and Target host diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 36033422a8..5bc7ce0988 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -73,9 +73,10 @@ case ${DISTRO_ID} in PYTHON_EXEC_PATH="$(which python3.8)" OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3" ;; - 9) - dnf -y install python3 python3-devel libselinux-python3 + 9|9.[0-9]*) + dnf -y install python3 python3-devel python3-libselinux PYTHON_EXEC_PATH="$(which python3)" + OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3" ;; esac ;; diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 2caa5ef6e4..1861ed9fc6 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -23,8 +23,8 @@ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: >- The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Yammy) CentOS 8 derivatives such - as Rocky Linux, CentOS 8 Stream and CentOS 9 Stream. + Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Yammy), CentOS Stream 9, and derivatives such + as Rocky Linux. when: (check_operating_system | default(True))| bool tags: - check-operating-system diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index e2f6e083a2..8e100c02e0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -642,3 +642,99 @@ name: openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bullseye parent: openstack-ansible-deploy-aio nodeset: debian-bullseye + +# rocky linux 9 +- job: + name: openstack-ansible-deploy-aio_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-infra_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-hosts_distro_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-hosts_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-hosts_metal-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_distro_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio-distro + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_ceph-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_nfs-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_distro_ceph-rockylinux-9 + parent: openstack-ansible-deploy-aio-distro + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-upgrade-aio_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + timeout: 10800 + +- job: + name: openstack-ansible-upgrade-infra_lxc-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + timeout: 10800 + +- job: + name: openstack-ansible-deploy-aio_metal-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_telemetry_metal-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-deploy-aio_distro_metal-rockylinux-9 + parent: openstack-ansible-deploy-aio-distro + nodeset: rockylinux-9 + voting: false + +- job: + name: openstack-ansible-deploy-aio_nspawn-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + +- job: + name: openstack-ansible-upgrade-aio_ceph-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + timeout: 10800 + +- job: + name: openstack-ansible-upgrade-aio_metal-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 + timeout: 10800 + +- job: + name: openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-9 + parent: openstack-ansible-deploy-aio + nodeset: rockylinux-9 diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index c01e93a351..bfc3b304c3 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -40,6 +40,7 @@ check: jobs: - openstack-ansible-deploy-aio_lxc-centos-9-stream + - openstack-ansible-deploy-aio_lxc-rockylinux-9 - openstack-ansible-deploy-aio_lxc-debian-bullseye - openstack-ansible-deploy-aio_lxc-ubuntu-focal - openstack-ansible-deploy-aio_lxc-ubuntu-jammy: @@ -47,6 +48,7 @@ gate: jobs: - openstack-ansible-deploy-aio_lxc-centos-9-stream + - openstack-ansible-deploy-aio_lxc-rockylinux-9 - openstack-ansible-deploy-aio_lxc-debian-bullseye - openstack-ansible-deploy-aio_lxc-ubuntu-focal periodic: @@ -81,6 +83,7 @@ check: jobs: - openstack-ansible-deploy-infra_lxc-centos-9-stream + - openstack-ansible-deploy-infra_lxc-rockylinux-9 - openstack-ansible-deploy-infra_lxc-debian-bullseye - openstack-ansible-deploy-infra_lxc-ubuntu-focal - openstack-ansible-deploy-infra_lxc-ubuntu-jammy: @@ -88,6 +91,7 @@ gate: jobs: - openstack-ansible-deploy-infra_lxc-centos-9-stream + - openstack-ansible-deploy-infra_lxc-rockylinux-9 - openstack-ansible-deploy-infra_lxc-debian-bullseye - openstack-ansible-deploy-infra_lxc-ubuntu-focal periodic: @@ -99,6 +103,7 @@ check: jobs: - openstack-ansible-deploy-hosts_lxc-centos-9-stream + - openstack-ansible-deploy-hosts_lxc-rockylinux-9 - openstack-ansible-deploy-hosts_lxc-debian-bullseye - openstack-ansible-deploy-hosts_lxc-ubuntu-focal - openstack-ansible-deploy-hosts_lxc-ubuntu-jammy: @@ -106,6 +111,7 @@ gate: jobs: - openstack-ansible-deploy-hosts_lxc-centos-9-stream + - openstack-ansible-deploy-hosts_lxc-rockylinux-9 - openstack-ansible-deploy-hosts_lxc-debian-bullseye - openstack-ansible-deploy-hosts_lxc-ubuntu-focal periodic: @@ -117,6 +123,7 @@ check: jobs: - openstack-ansible-deploy-hosts_metal-centos-9-stream + - openstack-ansible-deploy-hosts_metal-rockylinux-9 - openstack-ansible-deploy-hosts_metal-debian-bullseye - openstack-ansible-deploy-hosts_metal-ubuntu-focal - openstack-ansible-deploy-hosts_metal-ubuntu-jammy: @@ -124,6 +131,7 @@ gate: jobs: - openstack-ansible-deploy-hosts_metal-centos-9-stream + - openstack-ansible-deploy-hosts_metal-rockylinux-9 - openstack-ansible-deploy-hosts_metal-debian-bullseye - openstack-ansible-deploy-hosts_metal-ubuntu-focal periodic: @@ -135,11 +143,13 @@ check: jobs: - openstack-ansible-deploy-hosts_distro_lxc-centos-9-stream + - openstack-ansible-deploy-hosts_distro_lxc-rockylinux-9 - openstack-ansible-deploy-hosts_distro_lxc-debian-bullseye - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-focal gate: jobs: - openstack-ansible-deploy-hosts_distro_lxc-centos-9-stream + - openstack-ansible-deploy-hosts_distro_lxc-rockylinux-9 - openstack-ansible-deploy-hosts_distro_lxc-debian-bullseye - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-focal @@ -156,6 +166,7 @@ jobs: - openstack-ansible-deploy-aio_metal-debian-bullseye - openstack-ansible-deploy-aio_metal-centos-9-stream + - openstack-ansible-deploy-aio_metal-rockylinux-9 - openstack-ansible-deploy-aio_metal-ubuntu-focal - openstack-ansible-deploy-aio_metal-ubuntu-jammy: voting: false @@ -166,6 +177,7 @@ jobs: - openstack-ansible-deploy-aio_metal-debian-bullseye - openstack-ansible-deploy-aio_metal-centos-9-stream + - openstack-ansible-deploy-aio_metal-rockylinux-9 - openstack-ansible-deploy-aio_metal-ubuntu-focal - project-template: @@ -173,6 +185,7 @@ check: jobs: - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream + - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-9 - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-jammy: @@ -180,6 +193,7 @@ gate: jobs: - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream + - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-9 - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal @@ -188,6 +202,7 @@ check: jobs: - openstack-ansible-deploy-aio_distro_metal-centos-9-stream + - openstack-ansible-deploy-aio_distro_metal-rockylinux-9 - openstack-ansible-deploy-aio_distro_metal-ubuntu-focal experimental: jobs: @@ -246,6 +261,7 @@ - openstack-ansible-deploy-hosts_lxc_btrfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-9-stream + - openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-9 gate: jobs: - openstack-ansible-deploy-hosts_lxc_zfs-ubuntu-focal @@ -254,6 +270,7 @@ - openstack-ansible-deploy-hosts_lxc_btrfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-9-stream + - openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-9 - project-template: name: openstack-ansible-deploy-guide-jobs