Merge pull request #1218 from stackhpc/caracal-odds-and-ends

Caracal: various

Author: Alex-Welsh

.automation.conf/tempest/tempest-ci-multinode.overrides.conf

@@ -10,7 +10,7 @@ v3_endpoint_type = publicURL
 [compute]
 min_compute_nodes = 2
 min_microversion = 2.1
-max_microversion = 2.95
+max_microversion = 2.96
 
 [service-clients]
 http_timeout = 600
@@ -26,7 +26,7 @@ console_output = true
 storage_protocol = ceph
 build_timeout = 600
 min_microversion = 3.0
-max_microversion = 3.70
+max_microversion = 3.71
 
 [image]
 build_timeout = 600

.github/workflows/overcloud-host-image-build.yml

@@ -67,21 +67,14 @@ jobs:
         run: |
           echo "${{ steps.host_image_tag.outputs.host_image_tag }}"
 
-      - name: Clone StackHPC Kayobe repository
-        uses: actions/checkout@v4
-        with:
-          repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
-          path: src/kayobe
-
       - name: Install Kayobe
         run: |
           mkdir -p venvs &&
           pushd venvs &&
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe
+          pip install ../src/kayobe-config/requirements.txt
 
       - name: Install terraform
         uses: hashicorp/setup-terraform@v2

.github/workflows/overcloud-host-image-promote.yml

@@ -34,13 +34,6 @@ jobs:
           echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
         working-directory: src/kayobe-config
 
-      - name: Clone StackHPC Kayobe repository
-        uses: actions/checkout@v4
-        with:
-          repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
-          path: src/kayobe
-
       - name: Setup networking
         run: |
           if ! ip l show breth1 >/dev/null 2>&1; then
@@ -63,7 +56,7 @@ jobs:
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe
+          pip install ../src/kayobe-config/requirements.txt
 
       - name: Bootstrap the control host
         run: |

.github/workflows/overcloud-host-image-upload.yml

@@ -49,21 +49,14 @@ jobs:
           BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
           echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
 
-      - name: Clone StackHPC Kayobe repository
-        uses: actions/checkout@v4
-        with:
-          repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
-          path: src/kayobe
-
       - name: Install Kayobe
         run: |
           mkdir -p venvs &&
           pushd venvs &&
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe
+          pip install ../src/kayobe-config/requirements.txt
 
       - name: Bootstrap the control host
         run: |

.github/workflows/stackhpc-build-kayobe-image.yml

@@ -42,7 +42,7 @@ jobs:
   build-kayobe-image:
     name: Build kayobe image
     if: inputs.if || github.repository == 'stackhpc/stackhpc-kayobe-config' && github.event_name == 'push'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write

.github/workflows/stackhpc-container-image-build.yml

@@ -120,13 +120,6 @@ jobs:
         with:
           path: src/kayobe-config
 
-      - name: Clone StackHPC Kayobe repository
-        uses: actions/checkout@v4
-        with:
-          repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/${{ needs.generate-tag.outputs.openstack_release }}
-          path: src/kayobe
-
       - name: Make sure dockerd is running and test Docker
         run: |
           docker ps
@@ -146,7 +139,7 @@ jobs:
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe
+          pip install ../src/kayobe-config/requirements.txt
 
       # Required for Pulp auth proxy deployment and Docker registry login.
       # Normally installed during host configure.

.github/workflows/stackhpc-pull-request.yml

@@ -13,7 +13,7 @@ jobs:
   # would skip the workflow entirely, and would prevent us from making the
   # aio jobs required to pass (a skip counts as a pass).
   check-changes:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       pull-requests: read
     name: Check changed files

.yamllint

@@ -14,7 +14,6 @@ rules:
 
 ignore: |
   *etc/kayobe/environments/ci-multinode/secrets.yml
-  *etc/kayobe/environments/ci-multinode/kolla/globals-tls-config.yml
   .automation/
   releasenotes/
   .github/

README.rst

@@ -1,6 +1,6 @@
-================================================
-StackHPC Kayobe Configuration (Work in progress)
-================================================
+=============================
+StackHPC Kayobe Configuration
+=============================
 
 This repository provides a base Kayobe configuration for the Caracal release
 of StackHPC OpenStack.

doc/source/conf.py

@@ -32,7 +32,7 @@
 current_series = "2024.1"
 previous_series = "2023.1"
 branch = f"stackhpc/{current_series}"
-ceph_series = "quincy"
+ceph_series = "reef"
 
 # Substitutions loader
 rst_prolog = """

doc/source/configuration/cephadm.rst

@@ -19,8 +19,6 @@ create or modify Ceph cluster deployments. Supported features are:
 Resources
 =========
 
--  https://docs.ceph.com/en/quincy/cephadm/index.html
--  https://docs.ceph.com/en/quincy/
 -  https://docs.ceph.com/en/reef/cephadm/index.html
 -  https://docs.ceph.com/en/reef/
 -  https://github.com/stackhpc/ansible-collection-cephadm

doc/source/configuration/cloudkitty.rst

@@ -35,16 +35,6 @@ following in ``kolla/globals.yml``:
   cloudkitty_fetcher_backend: prometheus
   cloudkitty_storage_backend: elasticsearch
 
-If you have TLS enabled, you will also need to set the cafile for Prometheus
-and Elasticsearch. Set the following in ``kolla/globals.yml``.
-
-.. code-block::
-
-  {% raw %}
-  cloudkitty_prometheus_cafile: "{{ openstack_cacert }}"
-  cloudkitty_elasticsearch_cafile: "{{ openstack_cacert }}"
-  {% endraw %}
-
 The default collection period is one hour, which is likely too long for most
 systems as CloudKitty charges by the **entire** collection period if any usage
 is seen within this timeframe. This is regardless of actual usage, meaning that

doc/source/configuration/index.rst

@@ -12,7 +12,6 @@ the various features provided.
    release-train
    host-images
    lvm
-   swap
    cephadm
    monitoring
    wazuh

doc/source/configuration/swap.rst

@@ -43,13 +43,6 @@ Ubuntu:
     sudo apt -y install gcc libffi-dev python3-dev python-is-python3
 
 
-As a workaround for SMS lab's lack of DNS, add the following lines to ``/etc/hosts`` of the baremetal node:
-
-.. parsed-literal::
-
-    10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
-    10.205.3.187 pulp-server pulp-server.internal.sms-cloud
-
 Configure the system firewall and security settings:
 
 .. parsed-literal::
@@ -124,14 +117,6 @@ Once the seed vm is provisioned, deploy a local pulp server on the seed and then
     kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none
     $KAYOBE_CONFIG_PATH/environments/aufn-ceph/configure-local-networking.sh
 
-Once the local pulp server is deployed, we need to add the address of SMS lab test pulp to the local pulp container:
-
-.. parsed-literal::
-
-    ssh [email protected]
-    docker exec pulp sh -c 'echo "10.205.3.187 pulp-server pulp-server.internal.sms-cloud" | tee -a /etc/hosts'
-    exit
-
 We can now sync the contents of the local pulp server with that of SMS test pulp and then complete the seed VM setup:
 
 .. parsed-literal::

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

@@ -52,9 +52,9 @@ following options:
 
 * ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must
   exist before running the script.
-* ``KAYOBE_BRANCH`` (default: ``stackhpc/2023.1``) - The branch of Kayobe
+* ``KAYOBE_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of Kayobe
   source code to use.
-* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2023.1``) - The branch of
+* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of
   ``stackhpc-kayobe-config`` to use.
 * ``KAYOBE_AIO_LVM`` (default: ``true``) - Whether the image uses LVM.
 * ``KAYOBE_CONFIG_EDIT_PAUSE`` (default: ``false``) - Option to pause
@@ -102,7 +102,6 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b |current_release_git_branch_name|
    git clone https://github.com/stackhpc/stackhpc-kayobe-config -b |current_release_git_branch_name| kayobe-config
    popd
 
@@ -116,7 +115,7 @@ Create a virtual environment and install Kayobe:
    python3 -m venv kayobe
    source kayobe/bin/activate
    pip install -U pip
-   pip install ../src/kayobe
+   pip install ../src/kayobe-config/requirements.txt
    popd
 
 Add initial network configuration:

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

@@ -57,7 +57,6 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b |current_release_git_branch_name|
    git clone https://github.com/stackhpc/stackhpc-kayobe-config -b |current_release_git_branch_name| kayobe-config
    popd
 
@@ -71,7 +70,7 @@ Create a virtual environment and install Kayobe:
    python3 -m venv kayobe
    source kayobe/bin/activate
    pip install -U pip
-   pip install ../src/kayobe
+   pip install ../src/kayobe-config/requirements.txt
    popd
 
 Add initial network configuration:

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

@@ -35,19 +35,19 @@ deployment.
 
 To test it, you will need two virtual machines. Cirros does not support the Ceph
 kernel client, so you will need to use a different image. Any regular Linux
-distribution should work. As an example, this guide will use Ubuntu 20.04.
+distribution should work. As an example, this guide will use Ubuntu 22.04.
 
 Download the image locally:
 
 .. code-block:: bash
 
-      wget http://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+      wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
 
 Upload the image to Glance:
 
 .. code-block:: bash
 
-      openstack image create --container-format bare --disk-format qcow2 --file focal-server-cloudimg-amd64.img Ubuntu-20.04 --progress
+      openstack image create --container-format bare --disk-format qcow2 --file jammy-server-cloudimg-amd64.img Ubuntu-22.04 --progress
 
 Create a keypair:
 
@@ -59,8 +59,8 @@ Create two virtual machines from the image:
 
 .. code-block:: bash
 
-      openstack server create --flavor m1.small --image Ubuntu-20.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
-      openstack server create --flavor m1.small --image Ubuntu-20.04 --key-name id_rsa --network admin-tenant ubuntu-client-2
+      openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
+      openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-2
 
 Wait until the instances are active. It is worth noting that this process can
 take a while, especially if the overcloud is deployed to virtual machines. You

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

@@ -34,34 +34,6 @@ this guide. Installation:
 
    sudo apt/dnf install pwgen
 
-
-As of writing, there are three upstream patches in the works to make this
-process easier.
-
-#. A change to Kolla, to automate :ref:`this<kolla-change>` step to change the
-   extended start for the ``nova-api`` container.
-
-   The upstream patch can be found `here
-   <https://review.opendev.org/c/openstack/kolla/+/902057>`__.
-
-   This was previously mitigated with a change to the StackHPC fork of
-   Kolla-Ansible, which has since been reverted due to an unforeseen issue. See
-   `here <https://github.com/stackhpc/kolla-ansible/pull/503>`__ for more
-   details.
-
-#. A change to Nova, to automate :ref:`this<nova-change>` step to change the
-   nova cell0 database connection string.
-
-   The upstream patch can be found `here
-   <https://review.opendev.org/c/openstack/nova/+/903140>`__.
-
-#. A change to Kolla-Ansible, to automate :ref:`this<k-a-change>` step to
-   update service keystone user passwords.
-
-   The upstream patch can be found `here
-   <https://review.opendev.org/c/openstack/kolla-ansible/+/903178>`__.
-
-
 Full method
 ===========
 

doc/source/operations/secret-rotation.rst

@@ -176,7 +176,7 @@ you understand all the options before applying them.
     min_compute_nodes = 2
     # Required to test some API features
     min_microversion = 2.1
-    max_microversion = 2.95
+    max_microversion = 2.96
     # Flavors for creating test servers and server resize. The ``alt`` flavor should be larger.
     flavor_ref = <flavor UUID>
     flavor_ref_alt = <different flavor UUID>
@@ -197,7 +197,7 @@ you understand all the options before applying them.
     storage_protocol = ceph
     # Required to test some API features
     min_microversion = 3.0
-    max_microversion = 3.70
+    max_microversion = 3.71
 
 Tempest configuration override files are stored in
 ``.automation.conf/tempest/``. The default file used is

doc/source/operations/tempest.rst

@@ -18,8 +18,6 @@
         path: /etc/hosts
         marker: "# {mark} Kayobe entries"
         block: |
-          10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
-          10.205.3.187 pulp-server pulp-server.internal.sms-cloud
           192.168.37.2 internal.infra.mos.{{ root_domain }}
           192.168.39.2 public.infra.mos.{{ root_domain }}
       become: true