From 0c7865dac2672c58ab76bc1c0ede0dd0399c123a Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Thu, 1 Jun 2023 13:13:47 +0200
Subject: [PATCH] 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
---
 etc/ngcp-ngcpcfg/ngcpcfg.cfg             | 2 --
 t/fixtures/ngcpcfg_carrier.cfg           | 2 --
 t/fixtures/ngcpcfg_carrier_instances.cfg | 2 --
 t/fixtures/ngcpcfg_pro.cfg               | 2 --
 t/fixtures/ngcpcfg_pro_instances.cfg     | 2 --
 t/fixtures/programs.py                   | 1 -
 t/fixtures/read_cfg.sh                   | 2 --
 7 files changed, 13 deletions(-)

diff --git a/etc/ngcp-ngcpcfg/ngcpcfg.cfg b/etc/ngcp-ngcpcfg/ngcpcfg.cfg
index c009121c..2a1923a4 100644
--- a/etc/ngcp-ngcpcfg/ngcpcfg.cfg
+++ b/etc/ngcp-ngcpcfg/ngcpcfg.cfg
@@ -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"
diff --git a/t/fixtures/ngcpcfg_carrier.cfg b/t/fixtures/ngcpcfg_carrier.cfg
index 245fd606..c6611553 100644
--- a/t/fixtures/ngcpcfg_carrier.cfg
+++ b/t/fixtures/ngcpcfg_carrier.cfg
@@ -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"
diff --git a/t/fixtures/ngcpcfg_carrier_instances.cfg b/t/fixtures/ngcpcfg_carrier_instances.cfg
index ea9be41b..b02cdee6 100644
--- a/t/fixtures/ngcpcfg_carrier_instances.cfg
+++ b/t/fixtures/ngcpcfg_carrier_instances.cfg
@@ -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"
diff --git a/t/fixtures/ngcpcfg_pro.cfg b/t/fixtures/ngcpcfg_pro.cfg
index 2556d806..1a449455 100644
--- a/t/fixtures/ngcpcfg_pro.cfg
+++ b/t/fixtures/ngcpcfg_pro.cfg
@@ -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"
diff --git a/t/fixtures/ngcpcfg_pro_instances.cfg b/t/fixtures/ngcpcfg_pro_instances.cfg
index be3d2fbf..9b4eb581 100644
--- a/t/fixtures/ngcpcfg_pro_instances.cfg
+++ b/t/fixtures/ngcpcfg_pro_instances.cfg
@@ -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"
diff --git a/t/fixtures/programs.py b/t/fixtures/programs.py
index faecd84e..57811ad8 100644
--- a/t/fixtures/programs.py
+++ b/t/fixtures/programs.py
@@ -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",
diff --git a/t/fixtures/read_cfg.sh b/t/fixtures/read_cfg.sh
index 81376a11..af0e86ec 100755
--- a/t/fixtures/read_cfg.sh
+++ b/t/fixtures/read_cfg.sh
@@ -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:-}"