Merge "Replace flux wait with control plane wait"

[icn.git] / env / lib / common.sh

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 052c3ea..38088c3 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -7,8 +7,8 @@ IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
 IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
-BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"}
-BM_IMAGE=${BM_IMAGE:-"bionic-server-cloudimg-amd64.img"}
+BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
+BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}
 
 #Baremetal operator repository URL
 BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
@@ -40,6 +40,9 @@ KUSTOMIZE_VERSION="v4.3.0"
 #Cluster API version to use
 CAPI_VERSION="v0.4.3"
 
+#Cluster API version to use
+CAPM3_VERSION="v0.5.1"
+
 #The flux version to use
 FLUX_VERSION="0.20.0"