Merge branch 'stackhpc/2024.1' into kolla-config-alex

Author: Alex-Welsh

.automation

@@ -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

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

@@ -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-build.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-promote.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/overcloud-host-image-upload.yml

@@ -264,6 +264,28 @@ jobs:
         run: |
           docker image pull $KAYOBE_IMAGE
 
+      # Rocky 9 OVN deployments will fail when the hostname contains a '.'
+      - name: Fix hostname
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/fix-hostname.yml
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+
+      # Reboot to Apply hostname change
+      - name: Reboot
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/reboot.yml -e reboot_with_bootstrap_user=true
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+
       - name: Run growroot
         run: |
           docker run -t --rm \
@@ -304,10 +326,29 @@ jobs:
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
+      - name: Change rabbit queues from HA to Quorum
+        run: |
+          sed -i -e 's/om_enable_rabbitmq_high_availability: true/om_enable_rabbitmq_high_availability: false/' \
+                 -e 's/om_enable_rabbitmq_quorum_queues: false/om_enable_rabbitmq_quorum_queues: true/' \
+                 etc/kayobe/environments/ci-aio/kolla/globals.yml
+        if: inputs.upgrade
+
+      - name: Migrate RabbitMQ queues
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/rabbitmq-quorum-migration.sh
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: inputs.upgrade
+
       # If testing upgrade, checkout the current release branch
       # Stash changes to tracked files, and set clean=false to avoid removing untracked files.
+      # Revert changes to RabbitMQ Queue types to avoid a merge conflict
       - name: Stash config changes
-        run: git stash
+        run: git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
         if: inputs.upgrade
 
       - name: Checkout current release config

.github/workflows/stackhpc-all-in-one.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-build-kayobe-image.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-container-image-build.yml

@@ -0,0 +1,71 @@
+---
+# This workflow provides a workflow_dispatch (manual) trigger to deploy a
+# multi-node test cluster.
+
+name: Multinode
+'on':
+  workflow_dispatch:
+    # NOTE: workflow_dispatch is limited to 10 inputs.
+    inputs:
+      multinode_name:
+        description: Multinode cluster name
+        type: string
+        required: true
+      os_distribution:
+        description: Host OS distribution
+        type: choice
+        default: rocky
+        options:
+          - rocky
+          - ubuntu
+      neutron_plugin:
+        description: Neutron ML2 plugin
+        type: choice
+        default: ovn
+        options:
+          - ovn
+          - ovs
+      upgrade:
+        description: Whether to perform an upgrade
+        type: boolean
+        default: false
+      break_on:
+        description: When to break execution for manual interaction
+        type: choice
+        default: never
+        options:
+          - always
+          - failure
+          - never
+          - success
+      break_duration:
+        description: How long to break execution for (minutes)
+        type: number
+        default: 60
+      ssh_key:
+        description: SSH public key to authorise on Ansible control host
+        type: string
+      terraform_kayobe_multinode_version:
+        description: terraform-kayobe-multinode version
+        type: string
+        default: main
+jobs:
+  multinode:
+    name: Multinode
+    uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/[email protected]
+    with:
+      multinode_name: ${{ inputs.multinode_name }}
+      os_distribution: ${{ inputs.os_distribution }}
+      os_release: ${{ inputs.os_distribution == 'rocky' && '9' || 'jammy' }}
+      ssh_username: ${{ inputs.os_distribution == 'rocky' && 'cloud-user' || 'ubuntu' }}
+      neutron_plugin: ${{ inputs.neutron_plugin }}
+      upgrade: ${{ inputs.upgrade }}
+      break_on: ${{ inputs.break_on }}
+      # Workaround loss of number type using fromJSON: https://github.com/orgs/community/discussions/67182
+      break_duration: ${{ fromJSON(inputs.break_duration) }}
+      ssh_key: ${{ inputs.ssh_key }}
+      stackhpc_kayobe_config_version: ${{ github.ref_name }}
+      # NOTE(upgrade): Reference the PREVIOUS release here.
+      stackhpc_kayobe_config_previous_version: stackhpc/2023.1
+      terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
+    secrets: inherit

.github/workflows/stackhpc-multinode.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