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 = """