Merge pull request #598 from stackhpc/zed-misc-renames

Zed misc renames

Author: markgoddard

README.rst

@@ -2,17 +2,17 @@
 StackHPC Kayobe Configuration
 =============================
 
-This repository provides a base Kayobe configuration for the Yoga release
+This repository provides a base Kayobe configuration for the Zed release
 of StackHPC OpenStack.
 
 Documentation is hosted on `readthedocs.io
-<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-yoga/index.html>`__,
+<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-zed/index.html>`__,
 and includes release notes.
 
 Resources
 =========
 
-* Kayobe documentation: https://docs.openstack.org/kayobe/yoga/
+* Kayobe documentation: https://docs.openstack.org/kayobe/zed/
 * Kayobe source: https://opendev.org/openstack/kayobe
 * Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config
 * IRC: #openstack-kolla

doc/source/conf.py

@@ -29,7 +29,7 @@
 # -- StackHPC Kayobe configuration --------------------------------------
 # Variables to override
 
-current_series = "yoga"
+current_series = "zed"
 branch = f"stackhpc/{current_series}"
 
 # Substitutions loader

doc/source/configuration/release-train.rst

@@ -37,7 +37,7 @@ Configuration
 This configuration provides the following:
 
 * Configuration to deploy a local Pulp service as a container on the seed
-* Pulp repository definitions for CentOS Stream 8 and Rocky Linux 8
+* Pulp repository definitions for Rocky Linux 9 and Ubuntu Jammy 22.04
 * Playbooks to synchronise a local Pulp service with Ark
 * Configuration to use the local Pulp repository mirrors on control plane hosts
 * Configuration to use the local Pulp container registry on control plane hosts
@@ -74,16 +74,6 @@ The Ark pulp credentials issued by StackHPC should be configured in
 Package repositories
 --------------------
 
-Currently, Ark does not provide package repositories for Ubuntu - only
-container images. For this reason, ``stackhpc_pulp_sync_ubuntu_focal`` in
-``etc/kayobe/pulp.yml`` is set to ``false`` by default.
-
-CentOS Stream 8 and Rocky Linux 8/9 package repositories are synced based on the
-value of ``os_distribution``. If you need to sync multiple distributions,
-``stackhpc_pulp_sync_centos_stream8``, ``stackhpc_pulp_sync_rocky_8`` and
-``stackhpc_pulp_sync_rocky_9`` in ``etc/kayobe/pulp.yml`` may be set to
-``true``.
-
 On Ark, each package repository provides versioned snapshots using a datetime
 stamp (e.g. ``20220817T082321``). The current set of tested versions is defined
 in ``etc/kayobe/pulp-repo-versions.yml``. This file is managed by the StackHPC
@@ -93,10 +83,7 @@ repository.
 Package managers
 ----------------
 
-No configuration is provided for APT, since Ark does not currently provide
-package repositories for Ubuntu - only container images.
-
-For CentOS and Rocky Linux based systems, package manager configuration is
+For Rocky Linux based systems, package manager configuration is
 provided by ``stackhpc_dnf_repos`` in ``etc/kayobe/dnf.yml``, which points to
 package repositories on the local Pulp server. To use this configuration, the
 ``dnf_custom_repos`` variable must be set, and this is done for hosts in the
@@ -219,10 +206,10 @@ see this message when you later try to run ``pulp-container-sync.yml``:
 .. code-block:: console
 
     TASK [stackhpc.pulp.pulp_repository : Setup container repositories] *****************************
-    failed: [localhost] (item=stackhpc/centos-source-prometheus-jiralert) => changed=false
+    failed: [localhost] (item=stackhpc/rocky-source-prometheus-jiralert) => changed=false
     ansible_loop_var: item
     item:
-      name: stackhpc/centos-source-prometheus-jiralert
+      name: stackhpc/rocky-source-prometheus-jiralert
       policy: on_demand
       remote_password: password
       remote_username: username
@@ -238,7 +225,7 @@ with the push repository using the pulp CLI:
 
 .. code-block:: console
 
-    (venv-pulp) [stack@seed ~]$ pulp --base-url http://<pulp server>:8080--username admin --password <password> container distribution destroy --name stackhpc/centos-source-prometheus-jiralert
+    (venv-pulp) [stack@seed ~]$ pulp --base-url http://<pulp server>:8080--username admin --password <password> container distribution destroy --name stackhpc/rocky-source-prometheus-jiralert
     Started background task /pulp/api/v3/tasks/1f0a474a-b7c0-44b4-9ef4-ed633077f4d8/
     .Done.
 
@@ -251,20 +238,20 @@ you will see a 404 error during ``pulp-repo-sync.yml``:
 .. code-block:: console
 
     TASK [stackhpc.pulp.pulp_repository : Sync RPM remotes into repositories] ****************************************************************************************************************************************
-    An exception occurred during task execution. To see the full traceback, use -vvv. The error was: Exception: Task failed to complete. (failed; 404, message='Not Found', url=URL('https://ark.stackhpc.com/pulp/content/centos/8-stream/BaseOS/x86_64/os/20211122T102435'))
-    failed: [localhost] (item=centos-stream-8-baseos-development) => changed=false
+    An exception occurred during task execution. To see the full traceback, use -vvv. The error was: Exception: Task failed to complete. (failed; 404, message='Not Found', url=URL('https://ark.stackhpc.com/pulp/content/rocky/9/BaseOS/x86_64/os/20211122T102435'))
+    failed: [localhost] (item=rocky-9-baseos-development) => changed=false
       ansible_loop_var: item
       item:
-        name: centos-stream-8-baseos-development
+        name: rocky-9-baseos-development
         policy: on_demand
         proxy_url: __omit_place_holder__d35452c39719f081229941a64fd2cdce1188a287
         remote_password: <password>
         remote_username: <username>
         required: true
         state: present
         sync_policy: mirror_complete
-        url: https://ark.stackhpc.com/pulp/content/centos/8-stream/BaseOS/x86_64/os/20211122T102435
-      msg: Task failed to complete. (failed; 404, message='Not Found', url=URL('https://ark.stackhpc.com/pulp/content/centos/8-stream/BaseOS/x86_64/os/20211122T102435')) '''
+        url: https://ark.stackhpc.com/pulp/content/rocky/9/BaseOS/x86_64/os/20211122T102435
+      msg: Task failed to complete. (failed; 404, message='Not Found', url=URL('https://ark.stackhpc.com/pulp/content/rocky/9/BaseOS/x86_64/os/20211122T102435')) '''
 
 The issue can be rectified by updating the ``stackhpc_release_pulp_username``
 and ``stackhpc_release_pulp_password`` variables

doc/source/configuration/vault.rst

@@ -199,7 +199,7 @@ Enable the required TLS variables in kayobe and kolla
       # Copy the self-signed CA into the kolla containers
       kolla_copy_ca_into_containers: "yes"
       # Use the following trust store within the container
-      openstack_cacert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if os_distribution in ['centos', 'rocky'] else '/etc/ssl/certs/ca-certificates.crt' }}"
+      openstack_cacert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if os_distribution == 'rocky' else '/etc/ssl/certs/ca-certificates.crt' }}"
 
       # Backend TLS config
       # Enable backend TLS

doc/source/contributor/environments/aufn-ceph.rst

@@ -24,7 +24,7 @@ Setup
 
 To begin the manual setup, access the baremetal node via SSH and install some basic dependencies.
 
-CentOS or Rocky:
+Rocky:
 
 .. parsed-literal::
 

doc/source/contributor/environments/ci-aio.rst

@@ -13,7 +13,7 @@ make changes to the setup process.
 Prerequisites
 =============
 
-* a CentOS Stream 8 or Ubuntu Focal 20.04 host
+* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
 * access to the Test Pulp server on SMS lab
 
 Automated Setup
@@ -25,7 +25,7 @@ Download the setup script:
 
 .. parsed-literal::
 
-   wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/yoga/etc/kayobe/environments/ci-aio/automated-setup.sh
+   wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/zed/etc/kayobe/environments/ci-aio/automated-setup.sh
 
 Change the permissions on the script:
 
@@ -56,7 +56,7 @@ Access the host via SSH.
 
 Install package dependencies.
 
-On CentOS:
+On Rocky:
 
 .. parsed-literal::
 

doc/source/contributor/environments/ci-builder.rst

@@ -9,7 +9,7 @@ service, and pushed there once built.
 Prerequisites
 =============
 
-* a CentOS Stream 8 or Ubuntu Focal 20.04 host
+* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
 * access to the Test Pulp server on SMS lab
 
 Setup

doc/source/contributor/environments/ci-multinode.rst

@@ -2,6 +2,10 @@
 Multinode Test Environment
 ==========================
 
+.. warning::
+
+      The initial setup guide here is designed for the Yoga release of OpenStack. Proceed with caution.
+
 Set up hosts
 ============
 1. Create four baremetal instances with a centos 8 stream LVM image, and a

doc/source/contributor/package-updates.rst

@@ -7,17 +7,17 @@ This section describes the Release Train process of creating new package reposit
 Preparations
 ============
 
-1. Before building images, you should check for any outstanding PRs into the earliest supported release. Below are the links for the Wallaby branches.
+1. Before building images, you should check for any outstanding PRs into the earliest supported release. Below are the links for the Zed branches.
 
- kayobe-config: https://github.com/stackhpc/stackhpc-kayobe-config/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fwallaby
+ kayobe-config: https://github.com/stackhpc/stackhpc-kayobe-config/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fzed+
 
- kolla: https://github.com/stackhpc/kolla/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fwallaby
+ kolla: https://github.com/stackhpc/kolla/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fzed+
 
- kolla-ansible: https://github.com/stackhpc/kolla-ansible/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fwallaby
+ kolla-ansible: https://github.com/stackhpc/kolla-ansible/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fzed
 
  You should also check any referenced source trees in etc/kayobe/kolla.yml.
 
- e.g: https://github.com/stackhpc/stackhpc-kayobe-config/blob/320ba8b28da879917beec0ce7c4c90c478aaeaf7/etc/kayobe/kolla.yml#L112-L158
+ e.g: https://github.com/stackhpc/stackhpc-kayobe-config/blob/68026c4b2e605fcb0e60786ad438b32a74a50a13/etc/kayobe/kolla.yml#L113-L143
 
 2. Follow the workflows documented `here <https://stackhpc.github.io/stackhpc-release-train/usage/content-howto/#update-package-repositories>`_. Sync the package repositories. Then, for each release:
 
@@ -98,7 +98,7 @@ Checkout the new kayobe-config branch (from the draft PR):
    git fetch
    git checkout <branch-name>
 
-Bump the snapshot versions in /etc/yum/repos.d with:
+For Rocky Linux 9, bump the snapshot versions in /etc/yum/repos.d with:
 
 .. code-block:: console
 
@@ -119,7 +119,7 @@ Perform a rolling reboot of hosts:
    kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit compute[0]
 
    # Test live migration
-   openstack server create --image cirros --flavor m1.tiny --network external --hypervisor-hostname wallaby-pkg-refresh-ovs-compute-02.novalocal --os-compute-api-version 2.74 server1
+   openstack server create --image cirros --flavor m1.tiny --network external --hypervisor-hostname zed-pkg-refresh-ovs-compute-02.novalocal --os-compute-api-version 2.74 server1
    openstack server migrate --live-migration server1
    watch openstack server show server1
 
@@ -148,6 +148,8 @@ Deploy the services, once the new tags are set in the kayobe_config:
 
 Upgrading OpenStack to the next release in a multinode environment
 ------------------------------------------------------------------
+.. NOTE(Alex-Welsh): These instructions are a fair bit out of date now. While
+.. the structure is probably fine, it should reference the most recent release
 
 As this is not a full production system, only a reduced number of steps need to be followed to upgrade to a new release. Below describes these steps, with ``stackhpc/wallaby`` as the starting branch:
 

doc/source/release-notes.rst

@@ -1,6 +1,6 @@
 =========================
-Yoga Series Release Notes
+Zed Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: stackhpc/yoga
+   :branch: stackhpc/zed