X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=400dbd0b460e1f7ca2ea8e38e45088e1f2a06831;hb=31a860f56b53eb51a7dc4189e6959a004733115e;hp=9c08025d1c10a229986e5b064d4d94942c490110;hpb=4af76f3aff2833922846f7cbf6fc3490dd72ea93;p=icn.git diff --git a/env/lib/common.sh b/env/lib/common.sh index 9c08025..400dbd0 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -22,14 +22,10 @@ BS_DHCP_INTERFACE=${BS_DHCP_INTERFACE:-} BS_DHCP_INTERFACE_IP=${BS_DHCP_INTERFACE_IP:-} BS_DHCP_DIR=${BS_DHCP_DIR:-$DOWNLOAD_PATH/dhcp} -#User Provider Network configuration -PROVIDER_NETWORK_GATEWAY=${PROVIDER_NETWORK_GATEWAY:-} -PROVIDER_NETWORK_DNS=${PROVIDER_NETWORK_DNS:-} - #Ironic variables IRONIC_IMAGE=${IRONIC_IMAGE:-"integratedcloudnative/ironic:v1.0-icn"} IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"integratedcloudnative/ironic-inspector:v1.0-icn"} -IRONIC_BAREMETAL_IMAGE=${IRONIC_BAREMETAL_IMAGE:-"integratedcloudnative/baremetal-operator:v1.0-icn"} +IRONIC_BAREMETAL_IMAGE=${IRONIC_BAREMETAL_IMAGE:-"integratedcloudnative/baremetal-operator:v2.0-icn"} IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"integratedcloudnative/ironic-ipa-downloader:v1.0-icn"} IRONIC_BAREMETAL_SOCAT_IMAGE=${IRONIC_BAREMETAL_SOCAT_IMAGE:-"alpine/socat:latest"} @@ -105,3 +101,14 @@ function list_nodes { sed 's/"//g' } +function node_networkdata { + name=$1 + + NODES_FILE="${IRONIC_DATA_DIR}/nodes.json" + + if [ ! -f "$NODES_FILE" ]; then + exit 1 + fi + + cat $NODES_FILE | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net' +}