Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/307994
Change subject: Rename the labs instance setting labs_puppet_master.
......................................................................
Rename the labs instance setting labs_puppet_master.
We were using the same labs_puppet_master variable for
two unrelated purposes. Now the one that's used on labs
to determine whether or not to set root passwords is named
labs_global_puppet_master. Hopefully people won't be
tempted to override this.
Change-Id: If47fb903313a295f163385177d8d647ad49d3304
---
M hieradata/labs.yaml
M modules/base/manifests/labs.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/307994/1
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index c86a0a2..cf494f1 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -332,4 +332,4 @@
ipv4: 10.196.48.0/24
ipv6: 2620:0:860:204::/64
-labs_puppet_master: &labspuppetmaster "labs-puppetmaster-eqiad.wikimedia.org"
+labs_global_puppet_master: &labspuppetmaster
"labs-puppetmaster-eqiad.wikimedia.org"
diff --git a/modules/base/manifests/labs.pp b/modules/base/manifests/labs.pp
index 54e44c2..5a1bcb6 100644
--- a/modules/base/manifests/labs.pp
+++ b/modules/base/manifests/labs.pp
@@ -54,7 +54,7 @@
# puppetmaster. Self- and locally-hosted instances are on their own,
# but most likely already registered a password during their initial
# setup.
- if $::puppetmastername == hiera('labs_puppet_master') {
+ if $::puppetmastername == hiera('labs_global_puppet_master') {
# Create a root password and store it on the puppetmaster
user { 'root':
password => regsubst(
--
To view, visit https://gerrit.wikimedia.org/r/307994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If47fb903313a295f163385177d8d647ad49d3304
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
