added health check retry

Signed-off-by: Vivek Shankar <vshankar@progress.com>

components/automate-cs-nginx/habitat/hooks/health-check

@@ -9,10 +9,16 @@ curlOpts="$curlOpts --key {{pkg.svc_config_path}}/service.key"
 
 # This gets routed to erchef which does a "deep" health check
 # shellcheck disable=SC2086
-output=$({{pkgPathFor "core/curl"}}/bin/curl $curlOpts "https://automate-cs-nginx:{{cfg.service.port}}/_status")
-res=$?
-if [ "0" != "$res" ]; then
-    echo "health check curl command returned exit code ${res}:"
-    echo "$output"
-    exit 2
-fi
+
+for i in $(seq 1 5);
+do
+    output=$({{pkgPathFor "core/curl"}}/bin/curl $curlOpts "https://automate-cs-nginx:{{cfg.service.port}}/_status")
+    res=$?
+    if [ "0" = "$res" ]; then
+        exit 0
+    fi
+done
+
+echo "health check curl command returned exit code ${res}:"
+echo "$output"
+exit $res

components/automate-cs-oc-erchef/habitat/hooks/health-check

@@ -7,10 +7,18 @@ curlOpts="$curlOpts --cacert {{pkg.svc_config_path}}/root_ca.crt"
 curlOpts="$curlOpts --resolve automate-cs-oc-erchef:{{cfg.network.port}}:127.0.0.1"
 curlOpts="$curlOpts --noproxy automate-cs-oc-erchef"
 # shellcheck disable=SC2086
-output=$({{pkgPathFor "core/curl"}}/bin/curl $curlOpts "https://automate-cs-oc-erchef:{{cfg.network.port}}/_status")
-res=$?
-if [ "0" != "$res" ]; then
-    echo "health check curl command returned exit code ${res}:"
-    echo "$output"
-    exit 2
-fi
+
+for i in $(seq 1 5);
+do
+    output=$({{pkgPathFor "core/curl"}}/bin/curl $curlOpts "https://automate-cs-oc-erchef:{{cfg.network.port}}/_status")
+    res=$?
+    if [ "0" = "$res" ]; then
+        exit 0
+    fi
+done
+
+echo "health check curl command returned exit code ${res}:"
+echo "$output"
+exit $res
+
+# chef automate config show should hae port 5432

components/automate-pg-gateway/habitat/config/haproxy.conf

@@ -55,10 +55,10 @@ backend automate_postgresql
             {{~#if ../cfg.resolvers.nameservers }}
     server-template {{node.address}} 8 {{node.address}}:{{node.port}} check resolvers pgdns init-addr none  resolve-prefer ipv4
             {{else}}
-    server {{node.address}} {{node.address}}:5432 check maxconn 350 check port 6432
+    server {{node.address}} {{node.address}}:5432 maxconn 350 check port 6432
             {{~/if}}
        {{else}}
-    server {{node.address}} {{node.address}}:5432 check maxconn 350 check port 6432
+    server {{node.address}} {{node.address}}:5432 maxconn 350 check port 6432
        {{~/if}}
     {{~/each}}
 {{else~}}