X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=a6a6c4b560d1325077952526fa73f609a426d240;hb=9098160f02327e2454375310eda4c53f43fad05b;hp=f09ca6f31d053801e2a992d5a4b911d76ff32f60;hpb=43dbb5a2353606d1801f08dcf3e2fd06399843fb;p=icn.git diff --git a/env/lib/common.sh b/env/lib/common.sh index f09ca6f..a6a6c4b 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -2,6 +2,7 @@ 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"} @@ -81,8 +82,6 @@ function call_api { } function list_nodes { - NODES_FILE="${IRONIC_DATA_DIR}/nodes.json" - if [ ! -f "$NODES_FILE" ]; then exit 1 fi @@ -128,7 +127,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} } @@ -137,15 +135,12 @@ 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