Skip to content

Commit 4673817

Browse files
committed
CI: Specify external network by name
1 parent b4670cb commit 4673817

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

test/e2e/data/e2e_conf.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ variables:
203203
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
204204
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
205205
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
206-
OPENSTACK_EXTERNAL_NETWORK_ID: ""
206+
# The default external network created by devstack
207+
OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
207208
OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
208209
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
209210
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"

test/e2e/data/kustomize/default/kustomization.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,14 @@ components:
66
- ../common-patches/cni
77
- ../upgrade-patches
88
- ../common-patches/ccm
9+
10+
patches:
11+
- patch: |-
12+
- op: "remove"
13+
path: "/spec/externalNetwork"
14+
- op: "add"
15+
path: "/spec/externalNetwork"
16+
value:
17+
name: "${OPENSTACK_EXTERNAL_NETWORK_NAME}"
18+
target:
19+
kind: OpenStackCluster

0 commit comments

Comments
 (0)