Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394613 )
Change subject: puppet: revert puppet agents back to eqiad puppet 3 masters ...................................................................... puppet: revert puppet agents back to eqiad puppet 3 masters Bug: T177254 Change-Id: I857e2a02ef7ad60c7edd3459caf6ce816f2cb888 --- M templates/wikimedia.org M templates/wmnet 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Herron: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 97a0a50..40070fc 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -798,7 +798,7 @@ sv.planet 600 IN DYNA geoip!misc-addrs uk.planet 600 IN DYNA geoip!misc-addrs zh.planet 600 IN DYNA geoip!misc-addrs -puppet 1H IN CNAME puppetmaster2001.codfw.wmnet. +puppet 1H IN CNAME puppetmaster1001.eqiad.wmnet. pivot 600 IN DYNA geoip!misc-addrs racktables 600 IN DYNA geoip!misc-addrs scholarships 600 IN DYNA geoip!misc-addrs diff --git a/templates/wmnet b/templates/wmnet index 57796e1..fed46aa 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -891,7 +891,7 @@ phab1001-aphlict 1H IN CNAME phab1001 ; CNAME here due to varnish puppetization woes phab1001-vcs 1H IN A 10.64.16.100 phab1001-vcs 1H IN AAAA 2620:0:861:102:10:64:16:100 -puppet 1H IN CNAME puppetmaster2001.codfw.wmnet. +puppet 1H IN CNAME puppetmaster1001.eqiad.wmnet. technetium 1H IN A 10.64.32.188 thorium 1H IN A 10.64.53.26 thumbor1001 1H IN A 10.64.16.56 @@ -2547,7 +2547,7 @@ ; Service aliases config-master 1H IN CNAME puppetmaster1001.eqiad.wmnet. -puppet 1H IN CNAME puppetmaster2001.codfw.wmnet. +puppet 1H IN CNAME puppetmaster1001.eqiad.wmnet. webproxy 5M IN CNAME install2002.wikimedia.org. deployment 1H IN CNAME tin.eqiad.wmnet. m2-master 5M IN CNAME db2011.codfw.wmnet. @@ -4431,7 +4431,7 @@ ; SERVICES ; config-master 1H IN CNAME puppetmaster1001.eqiad.wmnet. -puppet 1H IN CNAME puppetmaster2001.codfw.wmnet. +puppet 1H IN CNAME puppetmaster1001.eqiad.wmnet. webproxy 5M IN CNAME install1002.wikimedia.org. ; etcd client discovery (RO) @@ -4672,7 +4672,7 @@ ; SERVICES ; config-master 1H IN CNAME puppetmaster1001.eqiad.wmnet. -puppet 5M IN CNAME puppetmaster2001.codfw.wmnet. +puppet 5M IN CNAME puppetmaster1001.eqiad.wmnet. webproxy 5M IN CNAME install2002.wikimedia.org. ; etcd client discovery (RO) @@ -4761,7 +4761,7 @@ ; SERVICES ; config-master 1H IN CNAME puppetmaster1001.eqiad.wmnet. -puppet 5M IN CNAME puppetmaster2001.codfw.wmnet. +puppet 5M IN CNAME puppetmaster1001.eqiad.wmnet. webproxy 5M IN CNAME install2002.wikimedia.org. ; etcd client discovery (RO) -- To view, visit https://gerrit.wikimedia.org/r/394613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I857e2a02ef7ad60c7edd3459caf6ce816f2cb888 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Herron <[email protected]> Gerrit-Reviewer: Herron <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
