Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/95359
Change subject: zuul: refer to puppet variables with a @ ...................................................................... zuul: refer to puppet variables with a @ Variables passed from puppet to ERB should be prepended with a @. http://docs.puppetlabs.com/guides/templating.html#referencing-variables Change-Id: Ibb19c0302b911201e5febcbc329d14610406746d --- M modules/zuul/templates/zuul.conf.erb 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/95359/1 diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index 35d7cc3..da48e66 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -1,26 +1,26 @@ [gearman] -server=<%= gearman_server %> +server=<%= @gearman_server %> [gearman_server] -start=<%= gearman_server_start %> +start=<%= @gearman_server_start %> log_config=/etc/zuul/gearman-logging.conf [jenkins] -server=<%= jenkins_server %> -user=<%= jenkins_user %> -apikey=<%= jenkins_apikey %> +server=<%= @jenkins_server %> +user=<%= @jenkins_user %> +apikey=<%= @jenkins_apikey %> [gerrit] -server=<%= gerrit_server %> -user=<%= gerrit_user %> -<% if gerrit_baseurl %>baseurl=<%= gerrit_baseurl %><% end %> +server=<%= @gerrit_server %> +user=<%= @gerrit_user %> +<% if @gerrit_baseurl %>baseurl=<%= @gerrit_baseurl %><% end %> sshkey=/var/lib/jenkins/.ssh/id_rsa [zuul] layout_config=/etc/zuul/wikimedia/layout.yaml log_config=/etc/zuul/logging.conf state_dir=/var/lib/zuul -git_dir=<%= git_dir %> -push_change_refs=<%= push_change_refs %> -url_pattern=<%= url_pattern %> -status_url=<%= status_url %> +git_dir=<%= @git_dir %> +push_change_refs=<%= @push_change_refs %> +url_pattern=<%= @url_pattern %> +status_url=<%= @status_url %> -- To view, visit https://gerrit.wikimedia.org/r/95359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb19c0302b911201e5febcbc329d14610406746d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
