MT#64514 Remove instances support

Change-Id: Ie6b57d9c87e3e3ae0138cb298f1ffa851713ddab

Author: guillemj

Makefile

@@ -12,14 +12,12 @@ PERL_SCRIPTS = \
 	helper/sync-db \
 	helper/tt2-process \
 	helper/validate-yml helper/fileformat_version \
-	sbin/ngcp-instances-validator \
 	sbin/ngcp-network \
 	sbin/ngcp-network-validator \
 	sbin/ngcp-sync-db-creds \
 	sbin/ngcp-sync-db-grants \
 	# EOL
 YAML_SCHEMAS = \
-	schemas/instances.yml \
 	schemas/sites.yml \
 	# EOL
 RESULTS ?= results

debian/ngcp-ngcpcfg.install

@@ -7,8 +7,6 @@ helper/cat-yml              usr/share/ngcp-ngcpcfg/helper/
 helper/check-for-mysql      usr/share/ngcp-ngcpcfg/helper/
 helper/del-value            usr/share/ngcp-ngcpcfg/helper/
 helper/fileformat_version   usr/share/ngcp-ngcpcfg/helper/
-helper/instance-info        usr/share/ngcp-ngcpcfg/helper/
-helper/instances-info       usr/share/ngcp-ngcpcfg/helper/
 helper/restore-permissions  usr/share/ngcp-ngcpcfg/helper/
 helper/set-value            usr/share/ngcp-ngcpcfg/helper/
 helper/sort-yml             usr/share/ngcp-ngcpcfg/helper/
@@ -18,13 +16,11 @@ helper/validate-yml         usr/share/ngcp-ngcpcfg/helper/
 hooks/                      usr/share/ngcp-ngcpcfg/
 lib/get_*                   usr/lib/ngcp-ngcpcfg/
 lib/set_*                   usr/lib/ngcp-ngcpcfg/
-sbin/ngcp-instances-validator usr/sbin/
 sbin/ngcp-network           usr/sbin/
 sbin/ngcp-network-validator usr/sbin/
 sbin/ngcp-sync-db-creds     usr/sbin/
 sbin/ngcp-sync-db-grants    usr/sbin/
 sbin/ngcpcfg                usr/sbin/
-schemas/instances.yml       usr/share/ngcp-ngcpcfg/schemas/
 schemas/sites.yml           usr/share/ngcp-ngcpcfg/schemas/
 scripts/apply               usr/share/ngcp-ngcpcfg/scripts/
 scripts/build               usr/share/ngcp-ngcpcfg/scripts/

debian/rules

@@ -5,7 +5,6 @@
 #export DH_VERBOSE = 1
 
 SCRIPTS = \
-	$(CURDIR)/usr/sbin/ngcp-instances-validator \
 	$(CURDIR)/usr/sbin/ngcp-network \
 	$(CURDIR)/usr/sbin/ngcp-network-validator \
 	# EOL

docs/ngcpcfg.txt

@@ -114,9 +114,6 @@ precedence to higher precedence):
 file, used by template-handler for generating /etc/foobar/baz. Configuration
 file is usually provided by a Debian package.
 
-* _/etc/ngcp-config/templates/etc/foobar/baz.tt2.inst-$INSTANCE_NAME_: ngcp_instance specific
-template file. $INSTANCE_NAME in lowercase specified at instances part on network.yml.
-
 * _/etc/ngcp-config/templates/etc/foobar/baz.tt2.$NGCP_NODENAME_: node specific
 template file. $NGCP_NODENAME is determined using the __ngcp-nodename__ program
 (being _spce_ for CE systems, and _spN_ where N is the index of the node in the
@@ -145,12 +142,6 @@ Note: This feature is available in High Availability setups only.
 template file, but configuration usually isn't provided by a Debian package and
 can be modified independently from any Debian package mechanism.
 
-* _/etc/ngcp-config/templates/etc/foobar/baz.customtt.tt2.inst-$INSTANCE_NAME_:
-configuration file similar to
-_/etc/ngcp-config/templates/etc/foobar/baz.tt2.inst-$INSTANCE_NAME_ but it's guaranteed
-that the file won't be part of any Debian package mechanism. $INSTANCE_NAME in
-lowercase specified at instances part on network.yml.
-
 * _/etc/ngcp-config/templates/etc/foobar/baz.customtt.tt2.$NGCP_NODENAME_: node
 specific template file.
 Regarding $NGCP_NODENAME the same as for _baz.tt2.$NGCP_NODE_NAME_
@@ -173,12 +164,10 @@ available in High Availability setups only.
 
 [IMPORTANT]
 Configuration file precedence (highest to lowest):
-*.customtt.tt2.inst-$INSTANCE_NAME
 *.customtt.tt2.$NGCP_HOSTNAME
 *.customtt.tt2.$NGCP_PAIRNAME
 *.customtt.tt2.$NGCP_NODENAME
 *.customtt.tt2
-*.tt2.inst-$INSTANCE_NAME
 *.tt2.$NGCP_HOSTNAME
 *.tt2.$NGCP_PAIRNAME
 *.tt2.$NGCP_NODENAME
@@ -255,17 +244,6 @@ be executed under "bash $FILE", so you can use commands e.g. like
 "ngcp-service foobar restart" and any further shell scripting syntax inside
 the services files
 
-NGCP instances
-~~~~~~~~~~~~~~
-
-ngcp-templates package provides the *TEMPLATE_INSTANCES* file defining what are
-the supported templates for instances. Meaning that ngcpcfg will generate
-one additional output per instance following the specifications provide by the
-file.
-
-ngcpcfg will generate that output with the template variable **instance_name** defined
-and the environment variable **INSTANCE_NAME** set for ngcpcfg.service scripts
-
 Global Options
 --------------
 

etc/ngcp-ngcpcfg/ngcpcfg.cfg

@@ -34,9 +34,6 @@ SERVICES_POOL_BASE="${NGCPCTL_MAIN}/templates"
 SITES_DIR="${NGCPCTL_MAIN}/sites"
 SITES_CONFIG="${NGCPCTL_MAIN}/sites.yml"
 
-# location of instances info for templates
-TEMPLATE_INSTANCES="${NGCPCTL_MAIN}/instances.yml"
-
 # timestamp format for console output
 TIME_FORMAT="+%F %T"
 

helper/instance-info

@@ -256,10 +256,6 @@ sub generate_iofiles {
 
     # Support for PRO/CARRIER systems.
     my @tt2_hosts;
-    # Support for instances, name in lowercase!!
-    if (length $ENV{INSTANCE_NAME}) {
-        push @tt2_hosts, ".inst-".lc $ENV{INSTANCE_NAME};
-    }
     foreach my $name (qw(HOST_FILE PAIR_FILE NODE_FILE)) {
         push @tt2_hosts, $ENV{$name} if defined $ENV{$name};
     }