Use post_bbr_healthcheck_timeout_in_seconds for backup and restore (#235)

* Use post_bbr_healthcheck_timeout_in_seconds for backup and restore
unlock

- still uses default of 60 seconds

Authored-by: Michael Oleske <moleske@pivotal.io>

Author: moleske

jobs/cloud_controller_ng/spec

@@ -350,6 +350,10 @@ properties:
     default: 60
     description: "Maximum time (in seconds) for cloud_controller_ng to report healthy"
 
+  cc.post_bbr_healthcheck_timeout_in_seconds:
+    default: 60
+    description: "Maximum time (in seconds) for cloud_controller_ng to report healthy in backup and restore unlock"
+
   cc.api_health_check_timeout_per_retry:
     default: 2
     description: "Maximum health check timeout (in seconds) for each retry attempt in the Cloud Controller's route registration health check"

jobs/cloud_controller_ng/templates/post-backup-unlock.sh.erb

@@ -14,7 +14,7 @@ source /var/vcap/packages/capi_utils/syslog_utils.sh
   fi
 
   monit_start_job cloud_controller_ng
-  wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> 60
+  wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> <%= p("cc.post_bbr_healthcheck_timeout_in_seconds") %>
   sleep 30
 
   <% (1..(p("cc.jobs.local.number_of_workers"))).each do |index| %>

jobs/cloud_controller_ng/templates/post-restore-unlock.sh.erb

@@ -14,7 +14,7 @@ source /var/vcap/packages/capi_utils/syslog_utils.sh
   fi
 
   monit_start_job cloud_controller_ng
-  wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> 60
+  wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> <%= p("cc.post_bbr_healthcheck_timeout_in_seconds") %>
   sleep 30
 
   <% (1..(p("cc.jobs.local.number_of_workers"))).each do |index| %>