From f1d7953dda43ec5b3c2a9c87049b538cbd736038 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 17 Dec 2019 01:58:23 +0100 Subject: [PATCH] TT#72351 Check nginx and ngcp-panel only on mgmt or li_dist nodes These services are only supposed to be present on mgmt or li_dist nodes, so there is no point in checking other nodes. Change-Id: Ic7a83a30acc5078b6b2108d4393e73b7a4ce9612 --- templates/900_service-ngcp-api.yaml.tt2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/900_service-ngcp-api.yaml.tt2 b/templates/900_service-ngcp-api.yaml.tt2 index 4f30ae3..34f9bd9 100644 --- a/templates/900_service-ngcp-api.yaml.tt2 +++ b/templates/900_service-ngcp-api.yaml.tt2 @@ -43,6 +43,7 @@ $stash->set(node_state => $node_state); [% END -%] +[% IF is_mgmt || is_li_dist -%] command: "curl --insecure -L http://[% web_ext_ips.0 %]/": @@ -164,7 +165,7 @@ command: timeout: 30000 -[% IF www_admin.enable == 'yes' && (is_mgmt || is_li_dist) && node_state == 'active' -%] +[% IF www_admin.enable == 'yes' && 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: @@ -215,3 +216,4 @@ command: - "/Active connections: [0-9]+/" stderr: [] timeout: 10000 +[% END -%]