From 7c52a0a5eb54256d7dc9858e03b4d17664c79d19 Mon Sep 17 00:00:00 2001
From: scrungus <tyler@stackhpc.com>
Date: Thu, 29 Jun 2023 09:46:49 +0000
Subject: [PATCH] add release train magnum image

---
 .github/workflows/stackhpc-capi-all-in-one.yml | 18 +++++++++---------
 etc/kayobe/kolla/globals.yml                   |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/stackhpc-capi-all-in-one.yml b/.github/workflows/stackhpc-capi-all-in-one.yml
index 8267ac569..b651d4cc0 100644
--- a/.github/workflows/stackhpc-capi-all-in-one.yml
+++ b/.github/workflows/stackhpc-capi-all-in-one.yml
@@ -264,15 +264,15 @@ jobs:
         run: |
           sudo docker image pull $KAYOBE_IMAGE
 
-      - name: Magnum container build
-        run: |
-          sudo -E 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 \
-            $KAYOBE_IMAGE \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-container-image-build.sh magnum
-        env:
-          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+      # - name: Magnum container build
+      #   run: |
+      #     sudo -E 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 \
+      #       $KAYOBE_IMAGE \
+      #       /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-container-image-build.sh magnum -vvvv
+      #   env:
+      #     KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
       - name: Service deploy
         run: |
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 64294c0ee..866855302 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -6,6 +6,9 @@
 # non-overcloud hosts
 enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
 
+kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
+
+magnum_tag: yoga-20230629T085301
 neutron_tag: yoga-20230515T150233
 octavia_tag: yoga-20230523T110936
 openvswitch_tag: yoga-20230515T150233