From 33d37575f9bbf2e57d6d58d4587fb68c9b0a42c9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 3 Oct 2022 12:03:06 +0200 Subject: [PATCH] Update RHEL family information Some time ago we dropped RHEL as one of possible options. During 'Zed' cycle we added Rocky Linux 9 as alternative to CentOS Stream 9. This change updates some mentions of both. Change-Id: I9ed93efcb7d1ff97b1c7d8342db8252aba2a9887 --- ansible/group_vars/all.yml | 3 +-- ansible/roles/prechecks/vars/main.yml | 2 -- doc/source/admin/tls.rst | 8 ++++---- .../deployment-and-bootstrapping/bifrost.rst | 2 +- doc/source/reference/networking/octavia.rst | 2 +- doc/source/user/quickstart.rst | 18 +++++++++--------- doc/source/user/support-matrix.rst | 16 +++++++++++----- etc/kolla/globals.yml | 2 +- 8 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index faa0fa661c..3e038a5677 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -42,7 +42,7 @@ kolla_ansible_setup_gather_subset: "{{ omit }}" # Valid options are [ COPY_ONCE, COPY_ALWAYS ] config_strategy: "COPY_ALWAYS" -# Valid options are ['centos', 'debian', 'rhel', 'ubuntu'] +# Valid options are ['centos', 'debian', 'rocky', 'ubuntu'] kolla_base_distro: "centos" kolla_internal_vip_address: "{{ kolla_internal_address | default('') }}" @@ -1188,7 +1188,6 @@ kafka_broker_count: "{{ groups['kafka'] | length }}" distro_python_version_map: { "centos": "3.9", "debian": "3.9", - "rhel": "3.6", "rocky": "3.9", "ubuntu": "3.10" } diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index d31e1349b8..f67ab08b87 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -15,8 +15,6 @@ host_os_distributions: - "bullseye" openEuler: - "22.03" - RHEL: - - "9" Rocky: - "9" Ubuntu: diff --git a/doc/source/admin/tls.rst b/doc/source/admin/tls.rst index 5a93b3cca5..f2acb9bb3d 100644 --- a/doc/source/admin/tls.rst +++ b/doc/source/admin/tls.rst @@ -59,7 +59,7 @@ If deploying on Debian or Ubuntu: openstack_cacert: "/etc/ssl/certs/ca-certificates.crt" -If on CentOS or RHEL: +If on CentOS or Rocky: .. code-block:: yaml @@ -185,12 +185,12 @@ file is named ``internal.crt``, it will be named For Debian and Ubuntu containers, the certificate files will be copied to the ``/usr/local/share/ca-certificates/`` directory. -For CentOS and RHEL containers, the certificate files will be copied to the +For CentOS and Rocky containers, the certificate files will be copied to the ``/etc/pki/ca-trust/source/anchors/`` directory. In both cases, valid certificates will be added to the system trust store - ``/etc/ssl/certs/ca-certificates.crt`` on Debian and Ubuntu, and -``/etc/pki/tls/certs/ca-bundle.crt`` on CentOS and RHEL. +``/etc/pki/tls/certs/ca-bundle.crt`` on CentOS and Rocky. Configuring a CA bundle ~~~~~~~~~~~~~~~~~~~~~~~ @@ -205,7 +205,7 @@ To use the system trust store on Debian or Ubuntu: openstack_cacert: /etc/ssl/certs/ca-certificates.crt -For CentOS or RHEL: +For CentOS or Rocky: .. code-block:: yaml diff --git a/doc/source/reference/deployment-and-bootstrapping/bifrost.rst b/doc/source/reference/deployment-and-bootstrapping/bifrost.rst index 5985acec9f..669fe893b0 100644 --- a/doc/source/reference/deployment-and-bootstrapping/bifrost.rst +++ b/doc/source/reference/deployment-and-bootstrapping/bifrost.rst @@ -144,7 +144,7 @@ be enabled by appending ``--type source`` to the :command:`kolla-build` or .. code-block:: console - --base [centos|debian|rhel|ubuntu] + --base [centos|debian|rocky|ubuntu] Configure and Deploy a Bifrost Container ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/reference/networking/octavia.rst b/doc/source/reference/networking/octavia.rst index 63f4f6ebd0..cbb1772311 100644 --- a/doc/source/reference/networking/octavia.rst +++ b/doc/source/reference/networking/octavia.rst @@ -318,7 +318,7 @@ Now deploy Octavia: Amphora image ============= -It is necessary to build an Amphora image. On CentOS / RHEL 8: +It is necessary to build an Amphora image. On CentOS / Rocky 9: .. code-block:: console diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 80a7f101d0..743a968193 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -48,7 +48,7 @@ execution, which is described in #. Install Python build dependencies: - For CentOS, RHEL 8 or openEuler, run: + For CentOS, Rocky or openEuler, run: .. code-block:: console @@ -67,7 +67,7 @@ If not installing Kolla Ansible in a virtual environment, skip this section. #. Install the virtual environment dependencies. - For CentOS, RHEL 8 or openEuler, you don't need to do anything. + For CentOS, Rocky or openEuler, you don't need to do anything. For Debian or Ubuntu, run: @@ -105,7 +105,7 @@ If installing Kolla Ansible in a virtual environment, skip this section. #. Install ``pip``. - For CentOS, RHEL or openEuler, run: + For CentOS, Rocky or openEuler, run: .. code-block:: console @@ -126,7 +126,7 @@ If installing Kolla Ansible in a virtual environment, skip this section. #. Install `Ansible `__. Kolla Ansible requires at least Ansible ``4`` and supports up to ``5``. - For CentOS or RHEL, run: + For CentOS or Rocky, run: .. code-block:: console @@ -347,7 +347,7 @@ than one node, edit ``multinode`` inventory: errors in the ``ping`` module. To quickly install Python with Ansible you can run: for Debian or Ubuntu: ``ansible -i multinode all -m raw -a "apt -y install python3"``, - and for CentOS, RHEL or openEuler: + and for CentOS, Rocky or openEuler: ``ansible -i multinode all -m raw -a "dnf -y install python3"``. Kolla passwords @@ -388,15 +388,15 @@ There are a few options that are required to deploy Kolla Ansible: Kolla provides choice of several Linux distributions in containers: - CentOS Stream (``centos``) - - Ubuntu (``ubuntu``) - Debian (``debian``) - - RHEL (``rhel``, deprecated) + - Rocky (``rocky``) + - Ubuntu (``ubuntu``) - For newcomers, we recommend to use CentOS Stream 8 or Ubuntu 20.04. + For newcomers, we recommend to use Rocky Linux 9 or Ubuntu 22.04. .. code-block:: console - kolla_base_distro: "centos" + kolla_base_distro: "rocky" * Networking diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 891a593e46..b740caf3b2 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -21,12 +21,18 @@ Kolla Ansible supports the following host Operating Systems (OS): host OS. The Victoria release will in future support both CentOS Linux 8 and CentOS Stream 8, and provides a route for migration. -* CentOS Stream 8 +.. note:: + + CentOS Stream 9 is supported as a host OS while Kolla does not publish CS9 + based images. Users can build them on their own. + + + +* CentOS Stream 9 * Debian Bullseye (11) * openEuler 22.03 LTS -* RHEL 8 (deprecated) -* Rocky Linux 8 -* Ubuntu Focal (20.04) +* Rocky Linux 9 +* Ubuntu Jammy (22.04) Supported container images ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -36,7 +42,7 @@ OS distribution. The following values are supported for ``kolla_base_distro``: * ``centos`` * ``debian`` -* ``rhel`` (deprecated) +* ``rocky`` * ``ubuntu`` For details of which images are supported on which distributions, see the diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 45ee9c10b6..058b04323c 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -30,7 +30,7 @@ workaround_ansible_issue_8743: yes # Valid options are [ COPY_ONCE, COPY_ALWAYS ] #config_strategy: "COPY_ALWAYS" -# Valid options are ['centos', 'debian', 'rhel', 'ubuntu'] +# Valid options are ['centos', 'debian', 'rocky', 'ubuntu'] #kolla_base_distro: "centos" # Do not override this unless you know what you are doing.