Add Centos-9 Stream support

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/837589 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-galera_server/+/823983 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-rabbitmq_server/+/823985 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/841620 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-repo_server/+/841619 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_nova/+/841862 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-lxc_hosts/+/842236 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-openstack_hosts/+/842988 Change-Id: Ia916d9f1f9d53e86dbd44ec19234599d5ed81794
2022-01-04 11:59:00 -05:00 · 2022-01-04 11:59:00 -05:00 · 532cda8ecb
commit 532cda8ecb
parent 34ca646ece
9 changed files with 177 additions and 13 deletions
--- a/playbooks/openstack-hosts-setup.yml
+++ b/playbooks/openstack-hosts-setup.yml
@ -55,7 +55,8 @@
        that:
          - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or
            (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or
-            (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8')
+            (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or
+            (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), CentOS 8 derivatives such as Rocky Linux, and CentOS 8 Stream.
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@ -64,29 +64,50 @@ ssh_key_create
 # Determine the distribution which the host is running on
 determine_distro

+# Install the python interpreters
+case ${DISTRO_ID} in
+    rocky)
+        dnf -y install python38 python38-devel libselinux-python3
+        PYTHON_EXEC_PATH="$(which python3.8)"
+        OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3"
+        ;;
+    centos|rhel)
+        case ${DISTRO_VERSION_ID} in
+            8)
+                dnf -y install python38 python38-devel libselinux-python3
+                PYTHON_EXEC_PATH="$(which python3.8)"
+                ;;
+            9)
+                dnf -y install python3 python3-devel libselinux-python3
+                PYTHON_EXEC_PATH="$(which python3)"
+                ;;
+        esac
+        ;;
+    ubuntu|debian)
+        apt-get update
+        DEBIAN_FRONTEND=noninteractive apt-get -y install \
+          python3 python3-dev \
+          python3-minimal python3-apt \
+          python3-venv\
+        ;;
+esac
+
 # Install the base packages
 case ${DISTRO_ID} in
    rocky|centos|rhel)
        dnf -y install \
          git curl autoconf gcc gcc-c++ nc \
-          python38 python38-devel libselinux-python3 \
          systemd-devel pkgconf \
          openssl-devel libffi-devel \
          rsync wget
-          if [[ ${DISTRO_ID} == "rocky" ]]; then
-            OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3"
-          fi
-        PYTHON_EXEC_PATH="$(which python3.8)"
        ;;
    ubuntu|debian)
        apt-get update
        DEBIAN_FRONTEND=noninteractive apt-get -y install \
          git-core curl gcc netcat \
-          python3 python3-dev \
          libssl-dev libffi-dev \
          libsystemd-dev pkg-config \
-          python3-apt python3-venv \
-          python3-minimal wget
+          wget
        ;;
 esac

--- a/scripts/scripts-library.sh
+++ b/scripts/scripts-library.sh
@ -103,6 +103,7 @@ function determine_distro {
    source /etc/os-release 2>/dev/null
    export DISTRO_ID="${ID}"
    export DISTRO_NAME="${NAME}"
+    export DISTRO_VERSION_ID=${VERSION_ID}
 }

 function ssh_key_create {
--- a/tests/roles/bootstrap-host/tasks/check-requirements.yml
+++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml
@ -18,7 +18,8 @@
    that:
        (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or
        (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or
-        (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8')
+        (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or
+        (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), CentOS 8 derivatives such as Rocky Linux, and CentOS 8 Stream.
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@ -77,8 +77,8 @@
      vars:
        nodepool_overrides:
          uca_apt_repo_url: "{{ nodepool_vars.NODEPOOL_UCA_MIRROR }}"
-          openstack_hosts_centos_mirror_url: "{{ nodepool_vars.NODEPOOL_CENTOS_MIRROR }}"
-          centos_epel_mirror: "{{ nodepool_vars.NODEPOOL_EPEL_MIRROR }}"
+          openstack_hosts_centos_mirror_url: "{{ (ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_CENTOS_MIRROR, 'http://mirror.centos.org/centos') }}"
+          centos_epel_mirror: "{{ (ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}"
          galera_repo_host: "{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}:8080"
          nova_virt_type: 'qemu'
          # NOTE(jrosser)
--- a/tests/roles/bootstrap-host/tasks/prepare_networking.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_networking.yml
@ -39,7 +39,7 @@
    name: systemd_networkd
  vars:
    systemd_networkd_prefix: "osa_testing"
-    systemd_networkd_epel_mirror: "{{ nodepool_vars is defined | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}"
+    systemd_networkd_epel_mirror: "{{ (nodepool_vars is defined and ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}"
    systemd_interface_cleanup: true
    systemd_run_networkd: true
    systemd_netdevs:
--- a/tests/roles/bootstrap-host/vars/redhat-9.yml
+++ b/tests/roles/bootstrap-host/vars/redhat-9.yml
@ -0,0 +1,37 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+packages_install:
+  # - bridge-utils  bridge-utils is not available in 8
+  # - btrfs-progs  BTRFS is not available in 8
+  - curl
+  - dbus
+  - ethtool
+  - git
+  - iputils
+  - lvm2
+  - python3
+  - python3-devel
+  # - sshpass  sshpass is not available in 8
+  #- systemd-networkd  networkd is not available in 8
+  - vim
+  - xfsprogs
+
+packages_remove: []
+
+rc_local: /etc/rc.d/rc.local
+rc_local_insert_before: "^touch /var/lock/subsys/local$"
+
+nfs_package: nfs-utils
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@ -409,6 +409,97 @@
    parent: openstack-ansible-deploy-aio
    nodeset: ubuntu-focal

+# centos 9 stream
+- job:
+    name: openstack-ansible-deploy-aio_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-infra_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-hosts_distro_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-hosts_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-hosts_metal-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio-distro
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_ceph-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_nfs-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_ceph-centos-9-stream
+    parent: openstack-ansible-deploy-aio-distro
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-upgrade-aio_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+    timeout: 10800
+
+- job:
+    name: openstack-ansible-upgrade-infra_lxc-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+    timeout: 10800
+
+- job:
+    name: openstack-ansible-deploy-aio_metal-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal-centos-9-stream
+    parent: openstack-ansible-deploy-aio-distro
+    nodeset: centos-9-stream
+    voting: false
+
+- job:
+    name: openstack-ansible-deploy-aio_nspawn-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+
+- job:
+    name: openstack-ansible-upgrade-aio_ceph-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+    timeout: 10800
+
+- job:
+    name: openstack-ansible-upgrade-aio_metal-centos-9-stream
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-9-stream
+    timeout: 10800
+
 # centos 8 stream
 - job:
    name: openstack-ansible-deploy-aio_lxc-centos-8-stream
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@ -40,12 +40,14 @@
    check:
      jobs:
        - openstack-ansible-deploy-aio_lxc-centos-8-stream
+        - openstack-ansible-deploy-aio_lxc-centos-9-stream
        - openstack-ansible-deploy-aio_lxc-debian-bullseye
        - openstack-ansible-deploy-aio_lxc-rockylinux-8
        - openstack-ansible-deploy-aio_lxc-ubuntu-focal
    gate:
      jobs:
        - openstack-ansible-deploy-aio_lxc-centos-8-stream
+        - openstack-ansible-deploy-aio_lxc-centos-9-stream
        - openstack-ansible-deploy-aio_lxc-debian-bullseye
        - openstack-ansible-deploy-aio_lxc-rockylinux-8
        - openstack-ansible-deploy-aio_lxc-ubuntu-focal
@ -81,12 +83,14 @@
    check:
      jobs:
        - openstack-ansible-deploy-infra_lxc-centos-8-stream
+        - openstack-ansible-deploy-infra_lxc-centos-9-stream
        - openstack-ansible-deploy-infra_lxc-debian-bullseye
        - openstack-ansible-deploy-infra_lxc-rockylinux-8
        - openstack-ansible-deploy-infra_lxc-ubuntu-focal
    gate:
      jobs:
        - openstack-ansible-deploy-infra_lxc-centos-8-stream
+        - openstack-ansible-deploy-infra_lxc-centos-9-stream
        - openstack-ansible-deploy-infra_lxc-debian-bullseye
        - openstack-ansible-deploy-infra_lxc-rockylinux-8
        - openstack-ansible-deploy-infra_lxc-ubuntu-focal
@ -99,12 +103,14 @@
    check:
      jobs:
        - openstack-ansible-deploy-hosts_lxc-centos-8-stream
+        - openstack-ansible-deploy-hosts_lxc-centos-9-stream
        - openstack-ansible-deploy-hosts_lxc-debian-bullseye
        - openstack-ansible-deploy-hosts_lxc-rockylinux-8
        - openstack-ansible-deploy-hosts_lxc-ubuntu-focal
    gate:
      jobs:
        - openstack-ansible-deploy-hosts_lxc-centos-8-stream
+        - openstack-ansible-deploy-hosts_lxc-centos-9-stream
        - openstack-ansible-deploy-hosts_lxc-debian-bullseye
        - openstack-ansible-deploy-hosts_lxc-rockylinux-8
        - openstack-ansible-deploy-hosts_lxc-ubuntu-focal
@ -117,12 +123,14 @@
    check:
      jobs:
        - openstack-ansible-deploy-hosts_metal-centos-8-stream
+        - openstack-ansible-deploy-hosts_metal-centos-9-stream
        - openstack-ansible-deploy-hosts_metal-debian-bullseye
        - openstack-ansible-deploy-hosts_metal-rockylinux-8
        - openstack-ansible-deploy-hosts_metal-ubuntu-focal
    gate:
      jobs:
        - openstack-ansible-deploy-hosts_metal-centos-8-stream
+        - openstack-ansible-deploy-hosts_metal-centos-9-stream
        - openstack-ansible-deploy-hosts_metal-debian-bullseye
        - openstack-ansible-deploy-hosts_metal-rockylinux-8
        - openstack-ansible-deploy-hosts_metal-ubuntu-focal
@ -158,6 +166,7 @@
      jobs:
        - openstack-ansible-deploy-aio_metal-debian-bullseye
        - openstack-ansible-deploy-aio_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_metal-centos-9-stream
        - openstack-ansible-deploy-aio_metal-ubuntu-focal
        - openstack-ansible-deploy-aio_metal-rockylinux-8
        - openstack-ansible-upgrade-aio_metal-centos-8-stream:
@ -167,6 +176,7 @@
      jobs:
        - openstack-ansible-deploy-aio_metal-debian-bullseye
        - openstack-ansible-deploy-aio_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_metal-centos-9-stream
        - openstack-ansible-deploy-aio_metal-ubuntu-focal
        - openstack-ansible-deploy-aio_metal-rockylinux-8

@ -175,12 +185,14 @@
    check:
      jobs:
        - openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream
        - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye
        - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8
        - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal
    gate:
      jobs:
        - openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream
        - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye
        - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8
        - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal