From 939ffc25f9f571ff072342111a5413f1c31cff65 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Tue, 17 Apr 2018 11:38:00 +0200
Subject: [PATCH] TT#26264 Ensure no PRO services are available and running on
 CE

Change-Id: Ifc9912371c074de9bf7f8ccdc5163130b6cbe99c
(cherry picked from commit e50dbef21d1e3ae1a5b9c55e6183ce39b20adc78)
---
 templates/510_init-daemons-ngcp.yaml.tt2     | 12 +++++++
 templates/511_init-daemons-ngcp-pro.yaml.tt2 | 33 --------------------
 templates/goss.yaml.tt2                      |  3 --
 3 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 templates/511_init-daemons-ngcp-pro.yaml.tt2

diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 9ba7765..7dc3591 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -136,6 +136,18 @@ service:
     enabled: false
     running: [% is_proxy && node_state == 'active' && faxserver.enable == "yes" && general.ngcp_type != 'spce' ? 'true' : 'false' %]
 
+  influxdb-relay.service:
+    enabled: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+    running: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+
+  snmpd.service:
+    enabled: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+    running: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+
+  ngcp-snmp-agent.service:
+    enabled: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+    running: [% general.ngcp_type != 'spce' ? 'true' : 'false' %]
+
 [% IF general.license_key != '' -%]
   ngcp-license-client.service:
     enabled: true
diff --git a/templates/511_init-daemons-ngcp-pro.yaml.tt2 b/templates/511_init-daemons-ngcp-pro.yaml.tt2
deleted file mode 100644
index 6f96f47..0000000
--- a/templates/511_init-daemons-ngcp-pro.yaml.tt2
+++ /dev/null
@@ -1,33 +0,0 @@
-[%
-  PROCESS '/usr/lib/ngcp-ngcpcfg/get_hostname';
-  hostname = out;
-
-  argv.host = hostname;
-  argv.role = 'mgmt';
-  PROCESS '/usr/lib/ngcp-ngcpcfg/has_role';
-  is_mgmt = out;
-
-  argv.host = hostname;
-  argv.role = 'proxy';
-  PROCESS '/usr/lib/ngcp-ngcpcfg/has_role';
-  is_proxy = out;
--%]
-[% PERL -%]
-    my $node_state = qx(ngcp-check-active -v);
-    chomp $node_state;
-
-    $stash->set(node_state => $node_state);
-[% END -%]
-
-service:
-  influxdb-relay.service:
-    enabled: true
-    running: true
-
-  snmpd.service:
-    enabled: true
-    running: true
-
-  ngcp-snmp-agent.service:
-    enabled: true
-    running: true
diff --git a/templates/goss.yaml.tt2 b/templates/goss.yaml.tt2
index cc80af7..a35b642 100644
--- a/templates/goss.yaml.tt2
+++ b/templates/goss.yaml.tt2
@@ -18,9 +18,6 @@ gossfile:
 [% END -%]
   500_init-daemons-dabian.yaml: {}
   510_init-daemons-ngcp.yaml: {}
-[% IF general.ngcp_type != 'spce' -%]
-  511_init-daemons-ngcp-pro.yaml: {}
-[% END -%]
   610_kernel-sysctl-params.yaml: {}
   615_kernel-modules.yaml: {}
   800_network-hostname.yaml: {}