Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1

Change-Id: Idccd8dabe04c001da8df172548bbb5de9d831529

Author: bbezak

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

@@ -358,14 +358,9 @@ jobs:
       - container-image-build
       - runner-selection
     steps:
-      - name: Install package dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y git unzip python3-wheel python3-pip python3-venv curl jq wget openssh-server openssh-client
-
       - name: Install gh
         run: |
-          sudo mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null
+          sudo mkdir -p -m 755 /etc/apt/keyrings && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null
           sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
           echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
           sudo apt update
@@ -385,8 +380,13 @@ jobs:
           username: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_USER }}
           password: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_PASS }}
 
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: src/kayobe-config
+
       - name: Create and push Docker manifests
-        run: tools/multiarch-manifests.sh
+        run: src/kayobe-config/tools/multiarch-manifests.sh
 
       - name: Upload manifest logs
         uses: actions/upload-artifact@v4

etc/kayobe/stackhpc.yml

@@ -165,11 +165,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/18.7.0.2
+stackhpc_kolla_source_version: stackhpc/18.7.0.4
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.1
+stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.2
 
 ###############################################################################
 # Container image registry