[MediaWiki-commits] [Gerrit] autonstall: switch eqiad subnets to use eqiad's NS - change (operations/puppet)

2014-02-13 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has uploaded a new change for review.

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

Change subject: autonstall: switch eqiad subnets to use eqiad's NS
..

autonstall: switch eqiad subnets to use eqiad's NS

It only matters for the install phase, but let's not make installs
dependent on the other datacenter as much. Switch the NS set for eqiad
subnets to 208.80.154.239  208.80.152.131 (eqiad/pmtpa) instead of
208.80.152.131 208.80.152.132 (both pmtpa).

Change-Id: Ifd8292e78ea679553d3cc3836c9f21482e8d5f97
---
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/labs-hosts1-a-eqiad.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/private1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
13 files changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/113110/1

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 9245bd6..f2dc8ba 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.21.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 4abab83..5654cb9 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.36.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 5f54c23..95a44eb 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.4.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 7c85cc2..6be9f35 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.20.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 

[MediaWiki-commits] [Gerrit] autonstall: switch eqiad subnets to use eqiad's NS - change (operations/puppet)

2014-02-13 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has submitted this change and it was merged.

Change subject: autonstall: switch eqiad subnets to use eqiad's NS
..


autonstall: switch eqiad subnets to use eqiad's NS

It only matters for the install phase, but let's not make installs
dependent on the other datacenter as much. Switch the NS set for eqiad
subnets to 208.80.154.239  208.80.152.131 (eqiad/pmtpa) instead of
208.80.152.131 208.80.152.132 (both pmtpa).

Change-Id: Ifd8292e78ea679553d3cc3836c9f21482e8d5f97
---
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/labs-hosts1-a-eqiad.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/private1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
13 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



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 9245bd6..f2dc8ba 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.21.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 4abab83..5654cb9 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.36.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 5f54c23..95a44eb 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.4.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 7c85cc2..6be9f35 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-inetcfg/get_netmask  string  255.255.255.0
 d-inetcfg/get_gateway  string  10.64.20.1
-d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-inetcfg/confirm_static   boolean true
 
 d-imirror/http/proxy   string  http://brewster.wikimedia.org: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 4abab83..5654cb9 100644
---