X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=2009c58becfd740ddb881489cf0376fb2f43de1c;hb=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;hp=809e67f32fb251a5de5935acce15e3231edf99ce;hpb=47623705343c39416af4b272ff01b36ae097ddb7;p=icn.git diff --git a/env/lib/common.sh b/env/lib/common.sh index 809e67f..2009c58 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -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" @@ -144,7 +147,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 +158,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 }