Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161984
Change subject: Setup EQIAD NTP servers
......................................................................
Setup EQIAD NTP servers
Eqiad uses linne and dobson as NTP servers. Assign the ntp::server role
to chromium and hydrogen. Given that with all the if clauses the merge
node stanza was close to unreadable, split it to separate node stanzas
Change-Id: I61e0912349b25a5b5e15a70d4608352b33f00c6a
---
M manifests/site.pp
1 file changed, 38 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/161984/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 76a1fc4..29a7edb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -476,12 +476,49 @@
}
}
-node /^(chromium|hydrogen)\.wikimedia\.org$/ {
+node 'chromium.wikimedia.org' {
include admin
include base::firewall
include standard
include role::dns::recursor
+ interface::ip { 'url-downloader':
+ interface => 'eth0',
+ address => '208.80.154.156',
+ }
+ $url_downloader_ip = '208.80.154.156'
+
+ include role::url_downloader
+
+ class { 'ntp::server':
+ servers => [ '198.186.191.229',
+ '64.113.32.2',
+ '173.8.198.242',
+ '208.75.88.4',
+ '75.144.70.35',
+ ],
+ peers => [ 'dobson.wikimedia.org' ],
+ }
+ interface::add_ip6_mapped { 'main':
+ interface => 'eth0',
+ }
+}
+
+node 'hydrogen.wikimedia.org' {
+ include admin
+ include base::firewall
+ include standard
+ include role::dns::recursor
+
+ class { 'ntp::server':
+ servers => [ '173.9.142.98',
+ '66.250.45.2',
+ '169.229.70.201',
+ '69.31.13.207',
+ '72.167.54.201'
+ ],
+ peers => [ 'linne.wikimedia.org' ],
+ }
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
--
To view, visit https://gerrit.wikimedia.org/r/161984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61e0912349b25a5b5e15a70d4608352b33f00c6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
