TT#152101 replace comx fileshare service with ngcp-rest-api

* comx fileshare service is deprecated and should no longer be
  checked for its running state
* add ngcp-rest-api to the running state checks

Change-Id: Id461c280fe4e9d0d0b5700ee8e12fbdcc6467506
(cherry picked from commit 80696a33ba)
mr10.2
Kirill Solomko 4 years ago
parent 88ef1ffeac
commit 9a2bc65fcf

@ -108,7 +108,7 @@ command:
# optionally existing subdirectories
[% FOR dir IN ['/var/log/ngcp/ngcp-rtcengine/', '/var/log/ngcp/ngcp-comx-fileshare-service/'] -%]
[% FOR dir IN ['/var/log/ngcp/ngcp-rtcengine/' -%]
"if test -e [% dir %]; then find [% dir %] -maxdepth 1 -type f -size +0 -perm /o+rwx; fi":
exit-status: 0
stdout:

@ -1,6 +1,7 @@
[%
hostname = ngcp.get_hostname();
is_mgmt = ngcp.has_role(hostname, 'mgmt');
is_proxy = ngcp.has_role(hostname, 'proxy');
is_lb = ngcp.has_role(hostname, 'lb');
is_rtp = ngcp.has_role(hostname, 'rtp');
@ -60,6 +61,9 @@ process:
ngcp-faxserver:
running: {{if and [% is_proxy ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
ngcp-rest-api:
running: [% is_mgmt && rest_api.enable == 'yes' ? 'true' : 'false' %]
ngcp-snmp-agent:
running: true
@ -88,13 +92,3 @@ command:
stdout: []
{{end}}
stderr: []
"pgrep -c -n -f '[c]omx-fileshare.js'":
{{if and [% is_proxy && fileshare.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}}
exit-status: 0
stdout:
- "1"
{{else}}
exit-status: 1
stdout: []
{{end}}

@ -137,9 +137,9 @@ service:
enabled: false
running: {{if and [% is_proxy && rtcengine.enable == "yes" && general.ngcp_type != 'spce' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
ngcp-comx-fileshare-service.service:
enabled: false
running: {{if and [% is_proxy && fileshare.enable == "yes" && general.ngcp_type != 'spce' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
ngcp-rest-api.service:
enabled: [% is_mgmt && rest_api.enable == 'yes' ? 'true' : 'false' %]
running: [% is_mgmt && rest_api.enable == 'yes' ? 'true' : 'false' %]
janus.service:
enabled: false

Loading…
Cancel
Save