alex is a big dumb dumb

Author: Alex-Welsh

.github/workflows/stackhpc-all-in-one.yml

@@ -339,7 +339,7 @@ jobs:
       # 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 restore etc/kayobe/environments/ci-aio/kolla/globals && git stash
+        run: git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
         if: inputs.upgrade
 
       - name: Checkout current release config

etc/kayobe/environments/ci-aio/kolla/globals.yml

@@ -14,7 +14,3 @@ opensearch_heap_size: 200m
 
 # Increase Grafana timeout
 grafana_start_first_node_retries: 20
-
-# Ensure Rabbit is deployed with HA rather than Quorum queues (to test migrations)
-om_enable_rabbitmq_high_availability: true
-om_enable_rabbitmq_quorum_queues: false