Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363797 )
Change subject: profile::base: allow setting a puppet environment
......................................................................
profile::base: allow setting a puppet environment
Bug: T169485
Change-Id: Ied21e9297c8e4884a699b47477ca9d47875ef2cb
---
M modules/base/manifests/puppet.pp
M modules/base/templates/puppet.conf.d/10-main.conf.erb
M modules/profile/manifests/base.pp
3 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/363797/1
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 9da2eb7..19a364a 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -2,6 +2,7 @@
$server='puppet',
$certname=undef,
$dns_alt_names=undef,
+ $environment=undef,
) {
include ::passwords::puppet::database
include ::base::puppet::params
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 4745959..f64ec9f 100644
--- a/modules/base/templates/puppet.conf.d/10-main.conf.erb
+++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb
@@ -9,6 +9,9 @@
ssldir = /var/lib/puppet/ssl
rundir = /var/run/puppet
factpath = $vardir/lib/facter
+<%- if @environment -%>
+environment = <%= @environment %>
+<%- end -%>
[agent]
<%- if @use_srv_record -%>
diff --git a/modules/profile/manifests/base.pp
b/modules/profile/manifests/base.pp
index 7567265..35c19b9 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -1,6 +1,7 @@
class profile::base(
$puppetmaster = hiera('puppetmaster'),
$dns_alt_names = hiera('profile::base::dns_alt_names', false),
+ $environment = hiera('profile::base::environment', undef)
$use_apt_proxy = hiera('profile::base::use_apt_proxy', true),
$domain_search = hiera('profile::base::domain_search', $::domain),
$remote_syslog = hiera('profile::base:remote_syslog',
['syslog.eqiad.wmnet', 'syslog.codfw.wmnet']),
@@ -28,6 +29,7 @@
class { '::base::puppet':
server => $puppetmaster,
dns_alt_names => $dns_alt_names,
+ environment => $environment
}
# Temporary workaround for T140100. Remove as soon as Labs instances get
--
To view, visit https://gerrit.wikimedia.org/r/363797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied21e9297c8e4884a699b47477ca9d47875ef2cb
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
