Herron has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397624 )
Change subject: puppet: change location of environment setting from [main] to [agent] ...................................................................... puppet: change location of environment setting from [main] to [agent] Move puppet environment setting from [main] to [agent] to work around bug in puppet 4.8 which causes `puppet config print` commands to error out. Bug: T177254 Change-Id: I5e0fa00bc37bd90fa0a8423f0f21eabb680f758d --- M modules/base/templates/puppet.conf.d/10-main.conf.erb 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/397624/1 diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb b/modules/base/templates/puppet.conf.d/10-main.conf.erb index 65d62e5..3aea596 100644 --- a/modules/base/templates/puppet.conf.d/10-main.conf.erb +++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb @@ -9,9 +9,6 @@ ssldir = /var/lib/puppet/ssl rundir = /var/run/puppet factpath = $vardir/lib/facter -<%- unless @environment.nil? || @environment == '' -%> -environment = <%= @environment %> -<%- end -%> [agent] <%- if @use_srv_record -%> @@ -32,3 +29,6 @@ pluginsync = true report = true stringify_facts = false +<%- unless @environment.nil? || @environment == '' -%> +environment = <%= @environment %> +<%- end -%> -- To view, visit https://gerrit.wikimedia.org/r/397624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e0fa00bc37bd90fa0a8423f0f21eabb680f758d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
