Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/315918
Change subject: conftool::scripts::service: fixup for If1be5238493 ...................................................................... conftool::scripts::service: fixup for If1be5238493 Change-Id: I4c76e406f313686115a6ed288c6347ccb7a5ae5f --- M modules/conftool/files/pooler_loop.rb M modules/conftool/templates/depool-service.erb M modules/conftool/templates/pool-service.erb 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/315918/1 diff --git a/modules/conftool/files/pooler_loop.rb b/modules/conftool/files/pooler_loop.rb index 856550a..5b10c47 100755 --- a/modules/conftool/files/pooler_loop.rb +++ b/modules/conftool/files/pooler_loop.rb @@ -101,7 +101,7 @@ # do the whole procedure args[:cycles] times (1..args[:cycles]).each do # try to (de)pool the host we are on - `#{args[:command]} #{args[:pool_subject]}"` + `#{args[:command]} "#{args[:pool_subject]}"` # If the script exited with status !=0, we surely had an error; retry directly. if $CHILD_STATUS.exitstatus != 0 diff --git a/modules/conftool/templates/depool-service.erb b/modules/conftool/templates/depool-service.erb index 9e81e47..b7b609c 100755 --- a/modules/conftool/templates/depool-service.erb +++ b/modules/conftool/templates/depool-service.erb @@ -1,2 +1,2 @@ #!/bin/sh -/usr/local/bin/pooler-loop --depool --lvs-ips <%= @lvs_ips %> --pool-name <%= "#{@lvs_name}_#{@port}" %> service=<%= @service %> +/usr/local/bin/pooler-loop --depool --lvs-ips <%= @lvs_ips %> --pool-name <%= "#{@lvs_name}_#{@port}" %> service=<%= @title %> diff --git a/modules/conftool/templates/pool-service.erb b/modules/conftool/templates/pool-service.erb index 9b9d7ba..a8555d9 100755 --- a/modules/conftool/templates/pool-service.erb +++ b/modules/conftool/templates/pool-service.erb @@ -1,2 +1,2 @@ #!/bin/sh -/usr/local/bin/pooler-loop --pool --lvs-ips <%= @lvs_ips %> --pool-name <%= "#{@lvs_name}_#{@port}" %> service=<%= @service %> +/usr/local/bin/pooler-loop --pool --lvs-ips <%= @lvs_ips %> --pool-name <%= "#{@lvs_name}_#{@port}" %> service=<%= @title %> -- To view, visit https://gerrit.wikimedia.org/r/315918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c76e406f313686115a6ed288c6347ccb7a5ae5f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits