Merge branch 'change-host-check' of https://github.com/swetharepakula…

…/routing-release into develop
cloudfoundry · Oct 2, 2017 · dca19fb · dca19fb
2 parents c0ff24c + b61462e
commit dca19fb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/jobs/gorouter/spec b/jobs/gorouter/spec
@@ -82,7 +82,7 @@ properties:
     default: TLSv1.2
   router.dns_health_check_host:
       description: "Host to ping for confirmation of DNS resolution, only used when Routing API is enabled"
-      default: "consul.service.cf.internal"
+      default: "uaa.service.cf.internal"
   router.tls_pem:
     description: "Array of private keys and certificates used for TLS handshakes with downstream clients. Each element in the array is an object containing fields 'private_key' and 'cert_chain', each of which supports a PEM block. Required if router.enable_ssl is true."
     example: |

diff --git a/jobs/gorouter/templates/run_gorouter.erb b/jobs/gorouter/templates/run_gorouter.erb
@@ -9,7 +9,7 @@ source /var/vcap/packages/routing_utils/syslog_utils.sh
 <% if p("routing_api.enabled") %>
   set +e
 
-  host <%= p("router.dns_health_check_host") %>
+  host -r <%= p("router.dns_health_check_host") %>
   if [[ "0" != "$?" ]]; then
     echo "DNS is not up"
     exit 1

diff --git a/jobs/routing-api/spec b/jobs/routing-api/spec
@@ -69,7 +69,7 @@ properties:
 
   dns_health_check_host:
     description: "Host to ping for confirmation of DNS resolution"
-    default: consul.service.cf.internal
+    default: uaa.service.cf.internal
 
   routing_api.sqldb.host:
     description: "Host for SQL database"

diff --git a/jobs/routing-api/templates/routing-api_ctl.erb b/jobs/routing-api/templates/routing-api_ctl.erb
@@ -21,7 +21,7 @@ case $1 in
     tee_output_to_sys_log "${LOG_DIR}" "routing_api"
 
     set +e
-    host <%= p("dns_health_check_host") %>
+    host -r <%= p("dns_health_check_host") %>
     if [[ "0" != "$?" ]]; then
       echo "DNS is not up"
       exit 1

diff --git a/jobs/tcp_router/spec b/jobs/tcp_router/spec
@@ -61,7 +61,7 @@ properties:
 
   dns_health_check_host:
     description: "Host to ping for confirmation of DNS resolution"
-    default: consul.service.cf.internal
+    default: uaa.service.cf.internal
 
   metron.port:
     description: "The port used to emit dropsonde messages to the Metron agent."

diff --git a/jobs/tcp_router/templates/tcp_router_ctl.erb b/jobs/tcp_router/templates/tcp_router_ctl.erb
@@ -113,7 +113,7 @@ case $1 in
     echo -n "Starting ${NAME}."
 
     set +e
-    host <%= p("dns_health_check_host") %>
+    host -r <%= p("dns_health_check_host") %>
     if [[ "0" != "$?" ]]; then
       echo "DNS is not up"
       exit 1