From 2d34f24f4be224c88f824ab748eb37a310c621de Mon Sep 17 00:00:00 2001
From: Matt Pryor <matt@stackhpc.com>
Date: Fri, 8 Dec 2023 12:38:08 +0000
Subject: [PATCH] Fix Consul affinity in HA test (#70)

---
 .github/workflows/test-tag.yml                            | 5 -----
 environments/ci-ha/inventory/group_vars/all/variables.yml | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-tag.yml b/.github/workflows/test-tag.yml
index 904d13c7..934f382d 100644
--- a/.github/workflows/test-tag.yml
+++ b/.github/workflows/test-tag.yml
@@ -34,11 +34,6 @@ jobs:
           repository: ${{ github.repository }}
           ref: ${{ github.ref }}
           config-environment: ci-ha
-          # Use the configured Docker Hub mirror for the HA cluster for now
-          extra-vars: |
-            capi_cluster_registry_mirrors:
-              docker.io:
-                - "${{ secrets.DOCKER_HUB_MIRROR_URL }}"
 
       - name: Provision Azimuth
         uses: ./.github/actions/provision
diff --git a/environments/ci-ha/inventory/group_vars/all/variables.yml b/environments/ci-ha/inventory/group_vars/all/variables.yml
index 31f1a9e0..83be0d39 100644
--- a/environments/ci-ha/inventory/group_vars/all/variables.yml
+++ b/environments/ci-ha/inventory/group_vars/all/variables.yml
@@ -1,3 +1,6 @@
+# Unset the network ID so that a network + router are provisioned
+infra_network_id:
+
 # Flavor auto-detection picks the wrong flavors on Arcus, so override them
 #   The flavor to use for the seed VM (vm.ska.cpu.general.small)
 infra_flavor_id: c8b72062-5d52-4590-9d7a-68a670b44442
@@ -9,3 +12,7 @@ capi_cluster_worker_flavor: vm.ska.cpu.general.eighth
 # So one control plane node and two workers is sufficient for that
 capi_cluster_control_plane_count: 1
 capi_cluster_worker_count: 2
+# Disable affinity for the Consul server so we can have 3 pods on two nodes
+consul_release_overrides:
+  server:
+    affinity: ""