From 018033f7eefb8e08d4d13d404c28274857d5bc5e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Dec 2019 16:56:51 +0100 Subject: [PATCH] TT#72351 Match enabled and running for services that are not HA-handled These need to match, as the service is always going to be enabled or disabled, depending on the conditions, in constrast to HA-handled services, which are never enabled. Change-Id: I1f733e3b3ccb149482e7f8577d874c3f22345724 --- templates/510_init-daemons-ngcp.yaml.tt2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 8b8a6bd..3dc1bc3 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -22,7 +22,7 @@ service: running: [% is_proxy && node_state == 'active' && asterisk.enable == "yes" ? 'true' : 'false' %] coturn.service: - enabled: false + enabled: [% is_rtp && turnserver.enable == 'yes' ? 'true' : 'false' %] running: [% is_rtp && turnserver.enable == 'yes' ? 'true' : 'false' %] dnsmasq.service: @@ -30,7 +30,7 @@ service: running: [% is_mgmt && node_state == 'active' && bootenv.dhcp.enable == 'yes' ? 'true' : 'false' %] haproxy.service: - enabled: false + enabled: [% is_lb && haproxy.enable == "yes" && general.ngcp_type == 'carrier' ? 'true' : 'false' %] running: [% is_lb && haproxy.enable == "yes" && general.ngcp_type == 'carrier' ? 'true' : 'false' %] ngcp-hb-watchdog.service: @@ -78,7 +78,7 @@ service: running: true nginx.service: - enabled: [% nginx.enable == 'yes' ? 'true' : 'false' %] + enabled: [% (is_mgmt || is_li_dist) && nginx.enable == 'yes' ? 'true' : 'false' %] running: [% (is_mgmt || is_li_dist) && nginx.enable == 'yes' ? 'true' : 'false' %] prosody.service: @@ -86,7 +86,7 @@ service: running: [% is_proxy && node_state == 'active' && prosody.enable == 'yes' ? 'true' : 'false' %] ngcp-pushd.service: - enabled: [% pushd.enable == "yes" ? 'true' : 'false' %] + enabled: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %] running: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %] redis-server.service: @@ -94,7 +94,7 @@ service: running: [% (is_rtp || is_proxy || is_db) && redis.enable == "yes" ? 'true' : 'false' %] slapd.service: - enabled: false + enabled: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %] running: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %] sems-pbx.service: