From e22d9bf5143d9b9dbd3c2d4abd68d9c52a64d999 Mon Sep 17 00:00:00 2001 From: Will Martin Date: Tue, 6 Dec 2016 16:00:12 +0000 Subject: [PATCH] Handle no default in ctl script * Enable debug endpoint in lite deployments [#135509501] --- jobs/garden/templates/garden_ctl.erb | 4 +++- manifests/bosh-lite.yml | 1 + manifests/garden-groot-lite.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jobs/garden/templates/garden_ctl.erb b/jobs/garden/templates/garden_ctl.erb index fc6ddfcc7..3d9030883 100644 --- a/jobs/garden/templates/garden_ctl.erb +++ b/jobs/garden/templates/garden_ctl.erb @@ -166,9 +166,11 @@ case $1 in <% if p("garden.allow_host_access") %> \ --allow-host-access \ <% end %> \ - <% debug_ip, debug_port = p("garden.debug_listen_address").split(":") %> \ + <% if_p("garden.debug_listen_address") do |debug_listen_address| %> \ + <% debug_ip, debug_port = debug_listen_address.split(":") %> \ --debug-bind-ip=<%= debug_ip %> \ --debug-bind-port=<%= debug_port %> \ + <% end %> \ --default-rootfs=<%= p("garden.default_container_rootfs") %> \ --default-grace-time=<%= p("garden.default_container_grace_time") %> \ --graph-cleanup-threshold-in-megabytes=<%= p("garden.graph_cleanup_threshold_in_mb") %> \ diff --git a/manifests/bosh-lite.yml b/manifests/bosh-lite.yml index 79cd141de..654c14f13 100644 --- a/manifests/bosh-lite.yml +++ b/manifests/bosh-lite.yml @@ -22,6 +22,7 @@ jobs: graph_cleanup_threshold_in_mb: 1024 listen_network: tcp listen_address: 0.0.0.0:7777 + debug_listen_address: 0.0.0.0:17013 log_level: debug networks: diff --git a/manifests/garden-groot-lite.yml b/manifests/garden-groot-lite.yml index 6cceb80ef..79dc79737 100644 --- a/manifests/garden-groot-lite.yml +++ b/manifests/garden-groot-lite.yml @@ -26,6 +26,7 @@ jobs: graph_cleanup_threshold_in_mb: 1024 listen_network: tcp listen_address: 0.0.0.0:7777 + debug_listen_address: 0.0.0.0:17013 log_level: debug image_plugin: /var/vcap/jobs/grootfs/bin/grootfs_wrapper grootfs: