From a86ba1f278636bbfa727b92f94900b6bb87d62af Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 17 Apr 2018 11:37:02 +0200 Subject: [PATCH] TT#26264 Remove confusing comment, faxserver should be not available on CE Change-Id: I0715dbacb0f4418ead4479faa7dfcd9a7e9dd904 (cherry picked from commit 994c2f5bfd00ed8e71589772e620840cff8eb91e) --- templates/510_init-daemons-ngcp.yaml.tt2 | 4 ++++ templates/511_init-daemons-ngcp-pro.yaml.tt2 | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 203227e..9ba7765 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -132,6 +132,10 @@ service: enabled: [% is_mgmt && general.ngcp_type != 'spce' ? 'true' : 'false' %] running: [% is_mgmt && general.ngcp_type != 'spce' ? 'true' : 'false' %] + ngcp-faxserver.service: + enabled: false + running: [% is_proxy && node_state == 'active' && faxserver.enable == "yes" && 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 index d5a7d40..6f96f47 100644 --- a/templates/511_init-daemons-ngcp-pro.yaml.tt2 +++ b/templates/511_init-daemons-ngcp-pro.yaml.tt2 @@ -31,9 +31,3 @@ service: ngcp-snmp-agent.service: enabled: true running: true - - # XXX: This should be moved to the non-pro file, but the faxserver.enable - # is incorrectly enabled on spce. - ngcp-faxserver.service: - enabled: false - running: [% is_proxy && node_state == 'active' && faxserver.enable == "yes" ? 'true' : 'false' %]