Andrew Bogott has submitted this change and it was merged.
Change subject: Purge labs_puppet_master_secondary.
......................................................................
Purge labs_puppet_master_secondary.
Unused.
Change-Id: I0b35647b75db7fcfc7755da0200060c344d6b4a5
---
M hieradata/codfw.yaml
M hieradata/eqiad.yaml
M hieradata/labs.yaml
3 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
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
--
To view, visit https://gerrit.wikimedia.org/r/224660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b35647b75db7fcfc7755da0200060c344d6b4a5
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
