BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315930

Change subject: eqiad recdns IP fix: switch in puppet
......................................................................

eqiad recdns IP fix: switch in puppet

Note: we'll also probably need salt fixes, and fixes for
puppet-unmanaged config in network devices, etc...

Bug: T143915
Change-Id: If9056216f10fe1629123c5953b5113acb0ae0576
---
M manifests/realm.pp
M manifests/site.pp
M modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-esams.cfg
M modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-esams.cfg
M modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
M modules/install_server/files/dhcpd/dhcpd.conf
35 files changed, 43 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/315930/1

diff --git a/manifests/realm.pp b/manifests/realm.pp
index 3db4f4b..77b6f22 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -99,11 +99,11 @@
     $nameservers = [ ipresolve($dnsconfig['recursor'],4), 
ipresolve($dnsconfig['recursor_secondary'],4) ]
 } else {
     $nameservers = $site ? {
-        'eqiad' => [ '208.80.154.239', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
-        'codfw' => [ '208.80.153.254', '208.80.154.239' ], # codfw -> codfw, 
eqiad
-        'ulsfo' => [ '208.80.154.239', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
-        'esams' => [ '91.198.174.216', '208.80.154.239' ], # esams -> esams, 
eqiad
-        default => [ '208.80.154.239', '208.80.153.254' ], #       -> eqiad, 
codfw
+        'eqiad' => [ '208.80.154.254', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
+        'codfw' => [ '208.80.153.254', '208.80.154.254' ], # codfw -> codfw, 
eqiad
+        'ulsfo' => [ '208.80.154.254', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
+        'esams' => [ '91.198.174.216', '208.80.154.254' ], # esams -> esams, 
eqiad
+        default => [ '208.80.154.254', '208.80.153.254' ], #       -> eqiad, 
codfw
     }
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 1765b3c..91232ca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1764,7 +1764,7 @@
     #   so they need to use the recursive DNS backends directly
     #   (acamar and achernar) with fallback to eqiad
     # (doing this for all lvs for now, see T103921)
-    $nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.239' ]
+    $nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.254' ]
     role(lvs::balancer)
 
     interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1864,7 +1864,7 @@
     #   so they need to use the recursive DNS backends directly
     #   (nescio and maerlant) with fallback to eqiad
     # (doing this for all lvs for now, see T103921)
-    $nameservers_override = [ '91.198.174.106', '91.198.174.122', 
'208.80.154.239' ]
+    $nameservers_override = [ '91.198.174.106', '91.198.174.122', 
'208.80.154.254' ]
 
     role(lvs::balancer)
 
diff --git 
a/modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
index a668ed8..fd23fc4 100644
--- a/modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.5.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
index 07333c6..0728e12 100644
--- a/modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.21.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
index 99fd608..e19e1f5 100644
--- a/modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.36.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
index a85ce53..629fe58 100644
--- a/modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.53.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
index a14e75d..517f329 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.4.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
index 6189576..e9fee5f 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.192.20.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.codfw.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
index ec5cabf..e18f2b4 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.20.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
index 99fd608..e19e1f5 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.36.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
index 69d92a8..2f99862 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.52.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
index 68a3c81..0bd8128 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.192.21.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.codfw.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
index 92ac22b..17860c0 100644
--- a/modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.64.37.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
index 36f5bf9..df66c8b 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.192.0.1
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
index 60f4d19..74a7572 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.64.0.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
index ceab779..9ff38b2 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.192.16.1
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
index 3597d04..8d9f7cf 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.64.16.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
index 22e6573..0b056dd 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.192.32.1
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
index 0401b14..f6549ee 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.64.32.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
index 27be41a..fbee5e4 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.192.48.1
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
index 166341a..9cea78a 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.252.0
 d-i    netcfg/get_gateway      string  10.64.48.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.eqiad.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-esams.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-esams.cfg
index e4c1f75..d797e9f 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-esams.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-esams.cfg
@@ -4,7 +4,7 @@
 d-i    netcfg/get_domain       string  esams.wmnet
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.20.0.1
-d-i    netcfg/get_nameservers  string  91.198.174.216 208.80.154.239
+d-i    netcfg/get_nameservers  string  91.198.174.216 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.esams.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg 
b/modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
index 90d2018..42585aa 100644
--- a/modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
+++ b/modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.0
 d-i    netcfg/get_gateway      string  10.128.0.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 d-i    mirror/http/proxy       string  http://webproxy.ulsfo.wmnet:8080
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
index 3fcfbe7..3e8e234 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.224
 d-i    netcfg/get_gateway      string  208.80.153.1
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
index ff836a0..2829db9 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.192
 d-i    netcfg/get_gateway      string  208.80.154.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
index c742c5c..5676a41 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.224
 d-i    netcfg/get_gateway      string  208.80.153.33
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
index dbe3af4..129a7c5 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.192
 d-i    netcfg/get_gateway      string  208.80.154.129
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
index 9261865..19719b5 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.224
 d-i    netcfg/get_gateway      string  208.80.153.65
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
index 7baf3e2..efb61ad 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.192
 d-i    netcfg/get_gateway      string  208.80.154.65
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
index 605b1e7..0bcd073 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.224
 d-i    netcfg/get_gateway      string  208.80.153.97
-d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.239
+d-i    netcfg/get_nameservers  string  208.80.153.254 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
index 362afdc..f1eeea6 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.224
 d-i    netcfg/get_gateway      string  208.80.155.97
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git a/modules/install_server/files/autoinstall/subnets/public1-esams.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-esams.cfg
index 286a363..a064ae0 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-esams.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-esams.cfg
@@ -4,7 +4,7 @@
 d-i    netcfg/get_domain       string  wikimedia.org
 d-i    netcfg/get_netmask      string  255.255.255.128
 d-i    netcfg/get_gateway      string  91.198.174.1
-d-i    netcfg/get_nameservers  string  91.198.174.216 208.80.154.239
+d-i    netcfg/get_nameservers  string  91.198.174.216 208.80.154.254
 d-i    netcfg/confirm_static   boolean true
 
 # get_domain should be set, get_hostname is overwritten by DHCP
diff --git a/modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg 
b/modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
index a1e20ee..1b71314 100644
--- a/modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
+++ b/modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.240
 d-i    netcfg/get_gateway      string  198.35.26.1
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git 
a/modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 
b/modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
index a5b57c2..cba0426 100644
--- a/modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
+++ b/modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
@@ -6,7 +6,7 @@
 # ip address is taken from DHCP, rest is set here
 d-i    netcfg/get_netmask      string  255.255.255.240
 d-i    netcfg/get_gateway      string  208.80.155.65
-d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.153.254
+d-i    netcfg/get_nameservers  string  208.80.154.254 208.80.153.254
 d-i    netcfg/confirm_static   boolean true
 
 # NTP
diff --git a/modules/install_server/files/dhcpd/dhcpd.conf 
b/modules/install_server/files/dhcpd/dhcpd.conf
index ac6e093..6ce3650 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -16,7 +16,7 @@
 ddns-update-style none;
 log-facility local0;
 
-option domain-name-servers 208.80.154.239, 208.80.153.254; # eqiad, codfw 
caches
+option domain-name-servers 208.80.154.254, 208.80.153.254; # eqiad, codfw 
caches
 
 # for safety, leave this referring to a non-existent file
 filename "nonexistent-file";
@@ -354,7 +354,7 @@
     option broadcast-address 91.198.174.127;
     option routers 91.198.174.1;
     option domain-name "wikimedia.org";
-    option domain-name-servers 91.198.174.216, 208.80.154.239; # esams, eqiad 
caches
+    option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad 
caches
 
     next-server 91.198.174.112; # bast3001 (tftp server)
 }
@@ -367,7 +367,7 @@
     option broadcast-address 10.20.0.255;
     option routers 10.20.0.1;
     option domain-name "esams.wmnet";
-    option domain-name-servers 91.198.174.6, 208.80.154.239; # esams, eqiad 
caches
+    option domain-name-servers 91.198.174.6, 208.80.154.254; # esams, eqiad 
caches
 
     next-server 91.198.174.112; # bast3001 (tftp server)
 }
@@ -382,7 +382,7 @@
     option broadcast-address 10.21.0.255;
     option routers 10.21.0.1;
     option domain-name "mgmt.esams.wmnet";
-    option domain-name-servers 91.198.174.216, 208.80.154.239; # esams, eqiad 
caches
+    option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad 
caches
 
     next-server 91.198.174.112; # bast3001 (tftp server)
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9056216f10fe1629123c5953b5113acb0ae0576
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to