From d0838d7eb114b259e24b92556e1c697ae8b23568 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 13 Jun 2019 13:15:12 +0200 Subject: [PATCH] TT#60062 Mark ngcp-license-client as always enabled on PRO The mr5.5 is a sysvinit based release, so we have the service always enabled. And the ngcp-license-client is only available on PRO and CARRIER systems. Change-Id: I5f516f8a2fec60bb026909c55ba46588ed835867 --- templates/510_init-daemons-ngcp.yaml.tt2 | 6 ------ templates/511_init-daemons-ngcp-pro.yaml.tt2 | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 5706c2f..d7e8dbe 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -88,12 +88,6 @@ service: enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %] [% END -%] -[% IF general.license_key != '' || general.anonymous_usage_statistics == 'yes' -%] - - ngcp-license-client: - enabled: [% general.process_handler == 'none' ? 'true' : 'false' %] - running: true -[% END -%] [% IF mediator.enabled == 'yes' -%] mediator: diff --git a/templates/511_init-daemons-ngcp-pro.yaml.tt2 b/templates/511_init-daemons-ngcp-pro.yaml.tt2 index 3ad76ff..d140634 100644 --- a/templates/511_init-daemons-ngcp-pro.yaml.tt2 +++ b/templates/511_init-daemons-ngcp-pro.yaml.tt2 @@ -31,6 +31,12 @@ service: ngcp-snmp-agent: enabled: true running: true +[% IF general.license_key != '' || general.anonymous_usage_statistics == 'yes' -%] + + ngcp-license-client: + enabled: true + running: true +[% END -%] [% IF faxserver.enable == "yes" -%] # XXX: This should be moved to the non-pro file, but the faxserver.enable