TT#17987 Migrate 'enableD' options to standard 'enable' (to keep them in sync)

Change-Id: Ie595f47e8f0101f00ee581ac2e9aea26a1e53320
changes/90/18590/3
Alexander Lutay 8 years ago
parent a687361672
commit 3f53a3a4ef

@ -37,7 +37,7 @@
command:
"pgrep -c -f '[l]ua5.1 /usr/bin/prosody'":
[% IF is_proxy && prosody.enabled == 'yes' && node_state == 'active' -%]
[% IF is_proxy && prosody.enable == 'yes' && node_state == 'active' -%]
exit-status: 0
stdout:
- "1"
@ -48,7 +48,7 @@ command:
stderr: []
"pgrep -c -f '[p]erl-fcgi-pm \\[NGCP::Panel\\]'":
[% IF is_mgmt && www_admin.enabled == 'yes' -%]
[% IF is_mgmt && www_admin.enable == 'yes' -%]
exit-status: 0
stdout:
- "1"

@ -30,7 +30,7 @@
argv.role = 'li';
PROCESS '/usr/lib/ngcp-ngcpcfg/has_role';
is_li = out;
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enabled == 'yes';
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
-%]
[% PERL -%]
my $node_state = qx(ngcp-check-active -v);
@ -40,19 +40,19 @@
[% END -%]
service:
[% IF asterisk.enabled == "yes" -%]
[% IF asterisk.enable == "yes" -%]
asterisk:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
[% END -%]
[% IF intercept.enabled == "yes" -%]
[% IF intercept.enable == "yes" -%]
captagent:
enabled: false
running: [% is_proxy || is_rtp ? 'true' : 'false' %]
[% END -%]
[% IF turnserver.enabled == 'yes' -%]
[% IF turnserver.enable == 'yes' -%]
coturn:
enabled: false
@ -88,13 +88,13 @@ service:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
[% END -%]
[% IF mediator.enabled == 'yes' -%]
[% IF mediator.enable == 'yes' -%]
mediator:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
[% END -%]
[% IF www_admin.enabled == 'yes' -%]
[% IF www_admin.enable == 'yes' -%]
ngcp-panel:
enabled: [% is_mgmt ? 'true' : 'false' %]
@ -106,13 +106,13 @@ service:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
[% END -%]
[% IF rtpproxy.enabled == "yes" -%]
[% IF rtpproxy.enable == "yes" -%]
ngcp-rtpengine-daemon:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
running: [% is_rtp && node_state == 'active' ? 'true' : 'false' %]
[% END -%]
[% IF sems.enabled == "yes" -%]
[% IF sems.enable == "yes" -%]
ngcp-sems:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
@ -122,13 +122,13 @@ service:
ngcp-witnessd:
enabled: true
running: true
[% IF nginx.enabled == 'yes' -%]
[% IF nginx.enable == 'yes' -%]
nginx:
enabled: true
running: [% (is_mgmt || is_li_enabled) ? 'true' : 'false' %]
[% END -%]
[% IF prosody.enabled == 'yes' -%]
[% IF prosody.enable == 'yes' -%]
prosody:
enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
@ -140,13 +140,13 @@ service:
enabled: true
running: [% is_lb ? 'true' : 'false' %]
[% END -%]
[% IF redis.enabled == "yes" -%]
[% IF redis.enable == "yes" -%]
redis-server:
enabled: true
running: [% (is_rtp || is_proxy || is_db) ? 'true' : 'false' %]
[% END -%]
[% IF ldap.enabled == "yes" -%]
[% IF ldap.enable == "yes" -%]
slapd:
enabled: false

@ -20,7 +20,7 @@ command:
exit-status: 0
stdout: []
stderr: []
[% IF is_proxy && node_state == 'active' && rtpproxy.enabled == "yes" -%]
[% IF is_proxy && node_state == 'active' && rtpproxy.enable == "yes" -%]
lsmod | grep -c xt_RTPENGINE:
exit-status: 0

@ -41,7 +41,7 @@
argv.role = 'li';
PROCESS '/usr/lib/ngcp-ngcpcfg/has_role';
is_li = out;
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enabled == 'yes';
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
-%]
[% PERL -%]
my $node_state = qx(ngcp-check-active -v);
@ -171,7 +171,7 @@ command:
timeout: 30000
[% IF www_admin.enabled == 'yes' && (is_mgmt || is_li_enabled) && node_state == 'active' -%]
[% IF www_admin.enable == 'yes' && (is_mgmt || is_li_enabled) && node_state == 'active' -%]
"curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
exit-status: 0
stdout:

@ -9,12 +9,12 @@
argv.role = 'li';
PROCESS '/usr/lib/ngcp-ngcpcfg/has_role';
is_li = out;
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enabled == 'yes';
is_li_enabled = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
-%]
command:
[% IF grafana.enabled == 'yes' && (is_mgmt || is_li_enabled) -%]
[% IF grafana.enable == 'yes' && (is_mgmt || is_li_enabled) -%]
sqlite3 /var/lib/grafana/grafana.db "select name from data_source":
exit-status: 0
stdout:

@ -16,7 +16,7 @@
command:
[% IF is_proxy && asterisk.enabled == "yes" && node_state == 'active' -%]
[% IF is_proxy && asterisk.enable == "yes" && node_state == 'active' -%]
asterisk -rx "odbc show":
exit-status: 0
stdout:

Loading…
Cancel
Save