Specify external network with OPENSTACK_EXTERNAL_NETWORK_ID

This allows the e2e tests to run against a cloud with multiple external
networks.

Author: mdbooth

docs/book/src/clusteropenstack/configuration.md

@@ -133,7 +133,7 @@ When running CAPO with `--v=6` the gophercloud client logs its requests to the O
 
 ## External network
 
-External network is automatically found, but you can specify the external network explicitly by `spec.externalNetworkId` of `OpenStackCluster`.
+If there is only a single external network it will be detected automatically. If there is more than one external network you can specify which one the cluster should use by setting the environment variable `OPENSTACK_EXTERNAL_NETWORK_ID`.
 
 The public network id can be obtained by using command,
 

templates/cluster-template-external-cloud-provider.yaml

@@ -31,6 +31,7 @@ spec:
   nodeCidr: 10.6.0.0/24
   dnsNameservers:
   - ${OPENSTACK_DNS_NAMESERVERS}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4

templates/cluster-template-without-lb.yaml

@@ -30,6 +30,7 @@ spec:
   nodeCidr: 10.6.0.0/24
   dnsNameservers:
   - ${OPENSTACK_DNS_NAMESERVERS}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4

templates/cluster-template.yaml

@@ -31,6 +31,7 @@ spec:
   nodeCidr: 10.6.0.0/24
   dnsNameservers:
   - ${OPENSTACK_DNS_NAMESERVERS}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4

test/e2e/data/e2e_conf.yaml

@@ -108,6 +108,7 @@ variables:
   OPENSTACK_IMAGE_NAME: "ubuntu-2004-kube-v1.18.15"
   OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
   OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
+  OPENSTACK_EXTERNAL_NETWORK_ID: ""
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
 

test/e2e/data/infrastructure-openstack/cluster-template-external-cloud-provider.yaml

@@ -40,6 +40,7 @@ spec:
       flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
       image: ${OPENSTACK_BASTION_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4

test/e2e/data/infrastructure-openstack/cluster-template-without-lb.yaml

@@ -38,6 +38,7 @@ spec:
       flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
       image: ${OPENSTACK_BASTION_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4

test/e2e/data/infrastructure-openstack/cluster-template.yaml

@@ -39,6 +39,7 @@ spec:
       flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
       image: ${OPENSTACK_BASTION_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
+  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4