TT#81050 Fix precedence of HA_CONFIG and PAIR_CONFIG config.yml variants

To get uniform and unexpected behavior we should use the exact same
precedence used with the tt2 files.

Fixes: commit 354e7578c5
Change-Id: I86281f3bd236687baec58b3a2e29cf80550176da

etc/ngcp-config/ngcpcfg.cfg

@@ -10,9 +10,9 @@
 NGCPCTL_BASE='/etc'
 NGCPCTL_MAIN="${NGCPCTL_BASE}/ngcp-config"
 NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
-HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 HA_CONFIG="${HA_FILE:+${NGCPCTL_MAIN}/config${HA_FILE}.yml}"
 PAIR_CONFIG="${PAIR_FILE:+${NGCPCTL_MAIN}/config${PAIR_FILE}.yml}"
+HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 LOCAL_CONFIG="${NGCPCTL_MAIN}/config.local.yml"
 CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
 NETWORK_CONFIG="${NGCPCTL_MAIN}/network.yml"

scripts/build

@@ -42,7 +42,7 @@ if [ -n "${NGCP_JOBS:-}" ] ; then
   ARGS+=("--jobs=${NGCP_JOBS}")
 fi
 
-for f in ${NGCPCTL_CONFIG:-} ${HOST_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ${CONSTANTS_CONFIG:-} ; do
+for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ${CONSTANTS_CONFIG:-} ; do
   if [ -r "$f" ] ; then
     ARGS+=("-c" "$f")
   fi
@@ -87,8 +87,8 @@ else
   done
   if git diff-index --name-only HEAD | grep -q \
          -e "$(basename "$NGCPCTL_CONFIG")" \
-         -e "$(basename "$HOST_CONFIG")" \
          "${configs[@]}" \
+         -e "$(basename "$HOST_CONFIG")" \
          -e "$(basename "$LOCAL_CONFIG")" \
          -e "$(basename "$NETWORK_CONFIG")" \
          -e "$(basename "$CONSTANTS_CONFIG")" ; then
@@ -138,7 +138,7 @@ else
 fi
 
 # Apply configured file ownership and permissions
-for f in ${NGCPCTL_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ; do
+for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ; do
   if [ ! -f "${f}" ]; then
     continue
   fi

scripts/check

@@ -232,7 +232,7 @@ check_shared_storage() {
 }
 
 if [ "$*" = "" ] ; then
-  config_files="${NGCPCTL_CONFIG:-} ${HOST_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} ${EXTRA_CONFIG_FILES[*]} ${CONSTANTS_CONFIG:-}"
+  config_files="${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} ${EXTRA_CONFIG_FILES[*]} ${CONSTANTS_CONFIG:-}"
 else
   config_files="$*"
 fi

scripts/get

@@ -41,7 +41,7 @@ fi
 
 # Get the list of configs in proper order to load.
 declare -a ARGS
-for f in ${NGCPCTL_CONFIG:-} ${HOST_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ${CONSTANTS_CONFIG:-} ; do
+for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} ${NETWORK_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ${CONSTANTS_CONFIG:-} ; do
   if [ -r "$f" ] ; then
     ARGS+=("-c" "${f}")
   fi

t/fixtures/ngcpcfg_carrier.cfg

@@ -2,9 +2,9 @@
 [ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
 [ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
 [ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
-[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 [ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.ha.yml"
 [ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
+[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 [ -n "${LOCAL_CONFIG:-}" ] || LOCAL_CONFIG="${NGCPCTL_MAIN}/constants_local_carrier.yml"
 [ -n "${CONSTANTS_CONFIG:-}" ] || CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
 [ -n "${NETWORK_CONFIG:-}" ] || NETWORK_CONFIG="${NGCPCTL_MAIN}/network_carrier.yml"

t/fixtures/ngcpcfg_pro.cfg

@@ -2,9 +2,9 @@
 [ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
 [ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
 [ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
-[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 [ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.ha.yml"
 [ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
+[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
 [ -n "${LOCAL_CONFIG:-}" ] || LOCAL_CONFIG="${NGCPCTL_MAIN}/constants_local_pro.yml"
 [ -n "${CONSTANTS_CONFIG:-}" ] || CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
 [ -n "${NETWORK_CONFIG:-}" ] || NETWORK_CONFIG="${NGCPCTL_MAIN}/network_pro.yml"