From 5e2037cf8284d7af472c282471ec6b80c398ccea Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Tue, 17 May 2022 15:48:54 +0200
Subject: [PATCH] TT#177600 Remove redundant <template>.tt2.<nodename> suffix
 handling

This special handling was from a time when we did not have any other
generic suffix support to override based on hostname, nodename, role,
etc. It also depends on the now obsolete systems.cfg file which is
redundant and already covered by the information contained in
network.yml.

Our tt2-process tool already handles these suffixes, so there is no
point in special-casing them from within the build script. This way we
simplify our templating and overriding mechanism, and reduce duplication
of information.

Change-Id: Iabf597dbaddf755a7f85504975afc8666a58d272
---
 docs/ngcpcfg.txt | 28 +++++++++-------------------
 scripts/build    |  8 --------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/docs/ngcpcfg.txt b/docs/ngcpcfg.txt
index 50abb5df..afe1ee5f 100644
--- a/docs/ngcpcfg.txt
+++ b/docs/ngcpcfg.txt
@@ -35,7 +35,7 @@ sip:providerPRO or sip:carrier), depends on Debian package ngcp-ngcpcfg-ha.
 *local repository*:: the directory _/etc/ngcp-config/_, being a Git repository
 
 *remote systems*:: the other nodes inside High Availability setups, as defined
-in _/etc/ngcp-config/systems.cfg_
+in _/etc/ngcp-config/network.yml_
 
 *shared repository*:: Git repository shared amongst nodes inside a High
 Availability setup, as defined by the GLUSTERFS setting in
@@ -104,9 +104,6 @@ High Availability specific configuration files
 being _spce_ for CE systems, and _spN_ where N is the index of the node in
 the pair.
 
-* _/etc/ngcp-config/systems.cfg_: configuration file that specifies to which
-hosts changes should be pushed to.
-
 Supported template files
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -246,8 +243,6 @@ Syntax and layout of configuration files
 
 * _/etc/ngcp-config/ngcpcfg.cfg_: plain shell syntax style "key=value" entries
 
-* _/etc/ngcp-config/systems.cfg_: one ngcp_hostname or IP address per line
-
 * _central yml files_ (*.yml): YAML configuration syntax (see http://yaml.org/)
 
 * _template files_ (*.tt2): whatever the according software (Kamailio,
@@ -513,9 +508,10 @@ to also skip the _apply_ operation).  If the '--shared-only' option is set then
 the any pending commits will be pushed only to the shared repository only, any
 foreign hosts will be skipped then.  If ngcp_hostname(s) or IP address(es) is given
 as argument then the changes will be pushed to the shared repository and to the
-given hosts only. If no host has been specified then the hosts specified in
-_/etc/ngcp-config/systems.cfg_ are used. The magic word 'all' can be used as a 'host'
-to push the changes on all the nodes from the network.yml except the local one.
+given hosts only. If no host has been specified then the hosts for this pair
+specified in _/etc/ngcp-config/network.yml_ are used.
+The magic word 'all' can be used as a 'host' to push the changes on all the
+nodes from the network.yml except the local one.
 Note: This option is available in High Availability setups only.
 
   **push-parallel** [<options>] [all|sp1|sp2|<host(s)>]::
@@ -746,17 +742,11 @@ Requirements for High Availability setups:
 
 * hosts are expected to be set up for automatic ssh login (ssh-keygen && ssh-copy-id)
 
-* node names are expected to be sp1 and sp2 so the .tt2.sp1 and .tt2.sp2
-template files are supported
-
-Configuration on sp1 (expected to be master node in initial setup):
-
- ngcpcfg initialise
- ngcpcfg build
- printf "sp1\nsp2\n" > /etc/ngcp-config/systems.cfg
- ngcpcfg commit "provide systems.cfg"
+* node names are expected to be sp1 and sp2
 
-Configuration on sp2 (and any further existing system):
+Configuration on sp1 first (expected to be master node in initial setup),
+sequentially followed by configuration on sp2 (and any further existing
+system):
 
  ngcpcfg initialise
  ngcpcfg build
diff --git a/scripts/build b/scripts/build
index 41f12b03..5e84e73b 100755
--- a/scripts/build
+++ b/scripts/build
@@ -157,14 +157,6 @@ else
         build_file="${file##templates/}"
         build_file="${build_file%%.services}"
         build_file="${build_file%%.customtt}"
-
-        # drop HA file suffix of all registered nodes
-        if [ -r /etc/ngcp-config/systems.cfg ] ; then
-          while IFS= read -r host ; do
-            build_file="${build_file%%."${host}"}"
-          done < /etc/ngcp-config/systems.cfg
-        fi
-
         build_file="${build_file%%.tt2}"
         build_file="/${build_file}"