Faidon has submitted this change and it was merged.
Change subject: Prepare rubidium/mexia for authdns migration
......................................................................
Prepare rubidium/mexia for authdns migration
eeden is left for now, as it has no service IP/easy way to switch back
and forth.
Change-Id: I6a3ef884c3f16a782b7e3b16b8dc960f33746d48
---
M manifests/role/authdns.pp
M manifests/site.pp
2 files changed, 10 insertions(+), 37 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp
index f7f0f22..a6ff48b 100644
--- a/manifests/role/authdns.pp
+++ b/manifests/role/authdns.pp
@@ -6,13 +6,14 @@
system_role { 'authdns': description => 'Authoritative DNS server' }
$nameservers = [
- 'ns0.wikimedia.org',
- 'ns1.wikimedia.org',
- 'ns2.wikimedia.org',
+ 'rubidium.wikimedia.org',
+ 'mexia.wikimedia.org',
+ 'eeden.esams.wikimedia.org',
]
$gitrepo = 'https://gerrit.wikimedia.org/r/p/operations/dns.git'
- include authdns::monitoring
+# temporarily commented-out, pending end of migration
+# include authdns::monitoring
include authdns::ganglia
}
@@ -27,7 +28,7 @@
}
class { 'authdns':
- fqdn => 'ns0.wikimedia.org',
+ fqdn => 'rubidium.wikimedia.org',
ipaddress => $ipv4,
nameservers => $nameservers,
gitrepo => $gitrepo,
@@ -45,7 +46,7 @@
}
class { 'authdns':
- fqdn => 'ns1.wikimedia.org',
+ fqdn => 'mexia.wikimedia.org',
ipaddress => $ipv4,
nameservers => $nameservers,
gitrepo => $gitrepo,
@@ -63,7 +64,7 @@
}
class { 'authdns':
- fqdn => 'ns2.wikimedia.org',
+ fqdn => 'eeden.esams.wikimedia.org',
ipaddress => $ipv4,
nameservers => $nameservers,
gitrepo => $gitrepo,
diff --git a/manifests/site.pp b/manifests/site.pp
index 0c3f33b..49fd875 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1826,21 +1826,7 @@
}
node 'rubidium.wikimedia.org' {
- # FIXME: to be switched to role::authdns::ns0 after the transition
- include standard
-
- $gitrepo = 'https://gerrit.wikimedia.org/r/p/operations/dns.git'
- $nameservers = [
- 'rubidium.wikimedia.org',
- 'mexia.wikimedia.org',
- 'eeden.esams.wikimedia.org',
- ]
-
- class { 'authdns':
- nameservers => $nameservers,
- gitrepo => $gitrepo,
- }
- include authdns::ganglia
+ include role::authdns::ns0
}
node "mchenry.wikimedia.org" {
@@ -1873,21 +1859,7 @@
}
node 'mexia.wikimedia.org' {
- # FIXME: to be switched to role::authdns::ns1 after the transition
- include standard
-
- $gitrepo = 'https://gerrit.wikimedia.org/r/p/operations/dns.git'
- $nameservers = [
- 'rubidium.wikimedia.org',
- 'mexia.wikimedia.org',
- 'eeden.esams.wikimedia.org',
- ]
-
- class { 'authdns':
- nameservers => $nameservers,
- gitrepo => $gitrepo,
- }
- include authdns::ganglia
+ include role::authdns::ns1
}
node /mobile100[1-4]\.wikimedia\.org/ {
--
To view, visit https://gerrit.wikimedia.org/r/80211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a3ef884c3f16a782b7e3b16b8dc960f33746d48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
