diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_api_health_check.erb b/jobs/cloud_controller_ng/templates/cloud_controller_api_health_check.erb index 88c0e78d5c..6a5c716dd8 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_api_health_check.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_api_health_check.erb @@ -18,4 +18,3 @@ if [[ $status > 0 ]] ; then echo $(date --rfc-3339=ns) "Failed to hit ${URL}" exit $status fi - diff --git a/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb b/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb index f3766b32dc..72e9278335 100644 --- a/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb +++ b/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb @@ -6,8 +6,5 @@ $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/l require 'cloud_controller/drain' @drain = VCAP::CloudController::Drain.new('/var/vcap/sys/log/cloud_controller_ng') -@drain.log_invocation(ARGV) @drain.shutdown_nginx('/var/vcap/sys/run/bpm/cloud_controller_ng/nginx.pid', <%= p("cc.nginx_drain_timeout") %>) @drain.shutdown_cc('/var/vcap/sys/run/bpm/cloud_controller_ng/cloud_controller_ng.pid') - -puts 0 # tell bosh the drain script succeeded