Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368611 )
Change subject: base::puppet: fix the environment declaration with the future parser ...................................................................... base::puppet: fix the environment declaration with the future parser Change-Id: Ifa5466da69b251de2186e41eaa6b22f625ea529a --- M modules/base/templates/puppet.conf.d/10-main.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified Volans: Looks good to me, but someone else must approve 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 8c53460..65d62e5 100644 --- a/modules/base/templates/puppet.conf.d/10-main.conf.erb +++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb @@ -9,7 +9,7 @@ ssldir = /var/lib/puppet/ssl rundir = /var/run/puppet factpath = $vardir/lib/facter -<%- if @environment != '' -%> +<%- unless @environment.nil? || @environment == '' -%> environment = <%= @environment %> <%- end -%> -- To view, visit https://gerrit.wikimedia.org/r/368611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa5466da69b251de2186e41eaa6b22f625ea529a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
