summaryrefslogtreecommitdiffstats
path: root/catalog-fe/sdc-frontend
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2019-08-29 17:05:58 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-08-30 08:01:20 +0000
commit6c86599c0352c5d86025495c6379132a0db52934 (patch)
tree56e3630e4b0ed68cf604acef82a7723fb92fa9ec /catalog-fe/sdc-frontend
parent3643cc5c5876f8ae43e89e9f437d4e9a4287f2fc (diff)
Update ready-probe file
Update ready-probe file to support the https mode. Issue-ID: SDC-2548 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I78328d7575d202d1d241785e07fb57573ffe2739
Diffstat (limited to 'catalog-fe/sdc-frontend')
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb12
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb7
2 files changed, 14 insertions, 5 deletions
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
index 14d08be94c..85ae99b847 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
@@ -1,5 +1,17 @@
+if node[:disableHttp]
+ protocol = "https"
+ port = "#{node['FE'][:https_port]}"
+else
+ protocol = "http"
+ port = "#{node['FE'][:http_port]}"
+end
+
template "/var/lib/ready-probe.sh" do
source "ready-probe.sh.erb"
sensitive true
mode 0755
+ variables({
+ :protocol => protocol,
+ :port => port
+ })
end \ No newline at end of file
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
index fed19d1aa2..bad5f878dd 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
@@ -1,9 +1,6 @@
#!/bin/bash
-<% if node[:disableHttp] -%>
-health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' https://127.0.0.1:<%= @ssl_port %>/sdc1/rest/healthCheck)
-<% else %>
-health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8181/sdc1/rest/healthCheck)
-<% end -%>
+health_Check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' <%= @protocol %>://127.0.0.1:<%= @port %>/sdc1/rest/healthCheck)
+
if [[ "$health_Check_http_code" -eq 200 ]]; then
exit 0
else