X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=f09ca6f31d053801e2a992d5a4b911d76ff32f60;hb=43dbb5a2353606d1801f08dcf3e2fd06399843fb;hp=052c3ea69f20a54b75c63e95a809415943f6b0f8;hpb=d79fe7fb70706331c8dd3eeeadf3d01caf3949e2;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 052c3ea..f09ca6f 100755
--- 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,9 +40,15 @@ 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"
 
+#The sops version to use
+SOPS_VERSION="v3.7.1"
+
 #refered from onap
 function call_api {
     #Runs curl with passed flags and provides
@@ -144,7 +150,7 @@ function node_networkdata {
         exit 1
     fi
 
-    printf "    networks:\n"
+    printf "networks:\n"
     for network in $(cat $NODES_FILE | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net.networks[].id'); do
 	link=$(networkdata_networks_field $name $network "link")
 	type=$(networkdata_networks_field $name $network "type")
@@ -155,17 +161,17 @@ function node_networkdata {
 	gateway=$(networkdata_networks_field $name $network "gateway")
 	dns_nameservers=$(networkdata_networks_field $name $network "dns_nameservers")
 
-	printf "      ${network}:\n"
-	printf "        macAddress: ${mac}\n"
-	printf "        type: ${type}\n"
+	printf "  ${network}:\n"
+	printf "    macAddress: ${mac}\n"
+	printf "    type: ${type}\n"
 	if [[ $ip_address != "null" ]]; then
-	    printf "        ipAddress: ${ip_address}\n"
+	    printf "    ipAddress: ${ip_address}\n"
 	fi
 	if [[ $gateway != "null" ]]; then
-	    printf "        gateway: ${gateway}\n"
+	    printf "    gateway: ${gateway}\n"
 	fi
 	if [[ $dns_nameservers != "null" ]]; then
-	    printf "        nameservers: ${dns_nameservers}\n"
+	    printf "    nameservers: ${dns_nameservers}\n"
 	fi
     done
 }
@@ -245,6 +251,13 @@ function install_emcoctl {
     sudo install -o root -g root -m 0755 ${EMCOPATH}/bin/emcoctl/emcoctl /usr/local/bin/emcoctl
 }
 
+function install_sops {
+    curl -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux -o sops
+    sudo install -o root -g root -m 0755 sops /usr/local/bin/sops
+    rm sops
+    sops --version
+}
+
 function fetch_image {
     if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
        mkdir -p "${IRONIC_DATA_DIR}/html/images"