Merge "Allow overriding of nodes.json location"

diff --combined env/lib/common.sh
index f09ca6f,6ee235e..a6a6c4b
--- 1/env/lib/common.sh
--- 2/env/lib/common.sh
+++ b/env/lib/common.sh
@@@ -2,6 -2,7 +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"}
@@@ -46,9 -47,6 +47,9 @@@ 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
@@@ -81,8 -79,6 +82,6 @@@
  }
  
  function list_nodes {
-     NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
- 
      if [ ! -f "$NODES_FILE" ]; then
          exit 1
      fi
@@@ -128,7 -124,6 +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 -132,12 +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
@@@ -251,13 -243,6 +246,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"