MT#55942 Remove HA_CONFIG usage

This variable has been deprecated for a long time (since mr10.5), and it
is not used anywhere in our entire NGCP code base.

Change-Id: Ic142a347fcef0405f8cf8304728b076af3369e0d
mr12.1
Guillem Jover 3 years ago
parent cf71caa167
commit 0c7865dac2

@ -11,8 +11,6 @@ NGCPCTL_BASE='/etc'
NGCPCTL_MAIN="${NGCPCTL_BASE}/ngcp-config"
NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
GLOB_CONFIG="${NGCPCTL_MAIN}/config.*.yml"
# HA_CONFIG is deprecated, only for backwards compatibility.
HA_CONFIG="${NODE_FILE:+${NGCPCTL_MAIN}/config${NODE_FILE}.yml}"
NODE_CONFIG="${NODE_FILE:+${NGCPCTL_MAIN}/config${NODE_FILE}.yml}"
PAIR_CONFIG="${PAIR_FILE:+${NGCPCTL_MAIN}/config${PAIR_FILE}.yml}"
HOST_CONFIG="${NGCPCTL_MAIN}/config.$(ngcp-hostname).yml"

@ -2,8 +2,6 @@
[ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
[ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
# HA_CONFIG is deprecated, only for backwards compatibility.
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${NODE_CONFIG:-}" ] || NODE_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.web01a.yml"

@ -2,8 +2,6 @@
[ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
[ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
# HA_CONFIG is deprecated, only for backwards compatibility.
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${NODE_CONFIG:-}" ] || NODE_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.web01a.yml"

@ -2,8 +2,6 @@
[ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
[ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
# HA_CONFIG is deprecated, only for backwards compatibility.
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${NODE_CONFIG:-}" ] || NODE_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.sp1.yml"

@ -2,8 +2,6 @@
[ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
[ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
# HA_CONFIG is deprecated, only for backwards compatibility.
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${NODE_CONFIG:-}" ] || NODE_CONFIG="${NGCPCTL_MAIN}/config.node.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.sp1.yml"

@ -21,7 +21,6 @@ READ_CFG = Path("fixtures/read_cfg.sh").resolve()
DEFAULT_CFG = Path("fixtures/ngcpcfg.cfg").resolve()
CFG_KEYS = [
"NGCPCTL_CONFIG",
"HA_CONFIG",
"NODE_CONFIG",
"PAIR_CONFIG",
"HOST_CONFIG",

@ -7,8 +7,6 @@ echo "[ngcpcfg]"
echo "NGCPCTL_BASE=${NGCPCTL_BASE:-}"
echo "NGCPCTL_MAIN=${NGCPCTL_MAIN:-}"
echo "NGCPCTL_CONFIG=${NGCPCTL_CONFIG:-}"
# HA_CONFIG is deprecated, only for backwards compatibility.
echo "HA_CONFIG=${NODE_CONFIG:-}"
echo "NODE_CONFIG=${NODE_CONFIG:-}"
echo "PAIR_CONFIG=${PAIR_CONFIG:-}"
echo "HOST_CONFIG=${HOST_CONFIG:-}"

Loading…
Cancel
Save