Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224660
Change subject: Purge labs_puppet_master_secondary.
......................................................................
Purge labs_puppet_master_secondary.
It was barely used and where it was used it didn't work.
Change-Id: I0b35647b75db7fcfc7755da0200060c344d6b4a5
---
M hieradata/codfw.yaml
M hieradata/eqiad.yaml
M hieradata/labs.yaml
M manifests/role/salt.pp
4 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/224660/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 33601f4..99c9056 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -31,7 +31,6 @@
labs_nova_controller_other: "labcontrol1001.wikimedia.org"
labs_glance_controller: "labcontrol2001.wikimedia.org"
labs_puppet_master: "labs-puppetmaster-codfw.wikimedia.org"
-labs_puppet_master_secondary: "labs-puppetmaster-eqiad.wikimedia.org"
labs_keystone_host: "labcontrol2001.wikimedia.org"
labs_ldap_dns_host: "labs-ns1.wikimedia.org"
labs_ldap_dns_host_secondary: "labs-ns0.wikimedia.org"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 1d141e1..c668fb4 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -36,7 +36,6 @@
labs_nova_controller_other: "labcontrol2001.wikimedia.org"
labs_glance_controller: "labcontrol1001.wikimedia.org"
labs_puppet_master: "labs-puppetmaster-eqiad.wikimedia.org"
-labs_puppet_master_secondary: "labs-puppetmaster-codfw.wikimedia.org"
labs_keystone_host: "labcontrol1001.wikimedia.org"
# These are the old, soon-to-be-phased-out dns servers:
labs_ldap_dns_host: "labs-ns0.wikimedia.org"
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 064e5e1..9fe50a8 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -49,8 +49,6 @@
"${::fqdn}": 1
nrpe::allowed_hosts: '10.68.16.195'
-labs_puppet_master: "labs-puppetmaster-eqiad.wikimedia.org"
-labs_puppet_master_secondary: "labs-puppetmaster-codfw.wikimedia.org"
labs_recursor: "labs-recursor0.wikimedia.org"
nfs_mounts:
project: true
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 9a24ff1..f6b9d5b 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -93,12 +93,10 @@
$salt_master_key = $::salt_master_key,
) {
if $::realm == 'labs' {
- $puppet_master = hiera('puppetmaster')
- $puppet_master_secondary = hiera('labs_puppet_master_secondary')
+ $labs_master = hiera('puppetmaster')
- $labs_masters = [ $puppet_master, $puppet_master_secondary ]
$labs_finger = 'c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd'
- $master = pick($salt_master, $labs_masters)
+ $master = pick($salt_master, $labs_master)
$master_finger = pick($salt_finger, $labs_finger)
salt::grain { 'instanceproject':
--
To view, visit https://gerrit.wikimedia.org/r/224660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b35647b75db7fcfc7755da0200060c344d6b4a5
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
