Allow overriding of nodes.json location

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

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 052c3ea..6ee235e 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -2,13 +2,14 @@
 set -eu -o pipefail
 
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
+NODES_FILE=${NODES_FILE:-"${IRONIC_DATA_DIR}/nodes.json"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 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 +41,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"
 
@@ -75,8 +79,6 @@ function call_api {
 }
 
 function list_nodes {
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
-
     if [ ! -f "$NODES_FILE" ]; then
         exit 1
     fi
@@ -122,7 +124,6 @@ function networkdata_networks_field {
     name=$1
     network=$2
     field=$3
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
     cat $NODES_FILE | jq -c -r --arg name "$name" --arg network "$network" --arg field "$field" '.nodes[] | select(.name==$name) | .net.networks[] | select(.id==$network).'${field}
 }
 
@@ -131,20 +132,17 @@ function networkdata_links_field {
     name=$1
     link=$2
     field=$3
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
     cat $NODES_FILE | jq -c -r --arg name "$name" --arg link "$link" --arg field "$field" '.nodes[] | select(.name==$name) | .net.links[] | select(.id==$link).'${field}
 }
 
 function node_networkdata {
     name=$1
 
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
-
     if [ ! -f "$NODES_FILE" ]; then
         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 +153,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
 }