BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160037
Change subject: define codfw recursive DNS
......................................................................
define codfw recursive DNS
Change-Id: I32e904446717e803d0cc15d35fe7aeda30b04cad
---
M manifests/role/lvs.pp
M manifests/site.pp
M modules/lvs/manifests/configuration.pp
3 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/160037/1
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 0209790..d8bf906 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -51,6 +51,15 @@
$sip['search'][$::site],
],
+ # codfw (should mirror eqiad above, eventually, and become merged with
it via regex
+ /^(lvs200[14])$/ => [
+ ],
+ /^(lvs200[25])$/ => [
+ $sip['dns_rec'][$::site],
+ ],
+ /^(lvs200[36])$/ => [
+ ],
+
# esams + ulsfo
/^(lvs[34]00[13])$/ => [
$sip['text'][$::site],
diff --git a/manifests/site.pp b/manifests/site.pp
index c49f606..c246645 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -57,6 +57,17 @@
# Node definitions (alphabetic order)
+node /^(acamar|achernar)\.wikimedia\.org$/ {
+ include admin
+ include base::firewall
+ include standard
+ include role::dns::recursor
+
+ interface::add_ip6_mapped { 'main':
+ interface => 'eth0',
+ }
+}
+
# To be decommissioned/reused, not presently serving traffic
node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
include admin
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 84a34e9..0519032 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -259,6 +259,7 @@
},
'dns_rec' => {
'eqiad' => { 'dns_rec' => "208.80.154.239", 'dns_rec6' =>
"2620:0:861:ed1a::f" },
+ 'codfw' => { 'dns_rec' => "208.80.153.254", 'dns_rec6' =>
"2620:0:861:ed1a::3:fe" },
},
'osm' => {
'eqiad' => "208.80.154.244",
--
To view, visit https://gerrit.wikimedia.org/r/160037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32e904446717e803d0cc15d35fe7aeda30b04cad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
