From 46738179bb64dd635140bcd55e0569a694063df4 Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbooth@redhat.com>
Date: Thu, 7 Mar 2024 15:35:03 +0000
Subject: [PATCH] CI: Specify external network by name

---
 test/e2e/data/e2e_conf.yaml                        |  3 ++-
 test/e2e/data/kustomize/default/kustomization.yaml | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
index 03ac783247..4d9552334c 100644
--- a/test/e2e/data/e2e_conf.yaml
+++ b/test/e2e/data/e2e_conf.yaml
@@ -203,7 +203,8 @@ variables:
   OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
   OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
   OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
-  OPENSTACK_EXTERNAL_NETWORK_ID: ""
+  # The default external network created by devstack
+  OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
   OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
diff --git a/test/e2e/data/kustomize/default/kustomization.yaml b/test/e2e/data/kustomize/default/kustomization.yaml
index 3cd7a6cbb8..4b02d6756e 100644
--- a/test/e2e/data/kustomize/default/kustomization.yaml
+++ b/test/e2e/data/kustomize/default/kustomization.yaml
@@ -6,3 +6,14 @@ components:
 - ../common-patches/cni
 - ../upgrade-patches
 - ../common-patches/ccm
+
+patches:
+- patch: |-
+    - op: "remove"
+      path: "/spec/externalNetwork"
+    - op: "add"
+      path: "/spec/externalNetwork"
+      value:
+        name: "${OPENSTACK_EXTERNAL_NETWORK_NAME}"
+  target:
+    kind: OpenStackCluster