[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: add mw1338->48

2018-01-15 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403928 )

Change subject: site.pp: add mw1338->48
..


site.pp: add mw1338->48

The site.pp mw hosts ordering has been changed to follow the rest
of site.pp (number increasing).

Bug: T165519
Change-Id: I688a90b1cb671f8b964d2541908ce2ef833512f7
---
M conftool-data/node/eqiad.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 23 insertions(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 48d4950..fcac9ea 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -7,6 +7,7 @@
 mw1260.eqiad.wmnet: [apache2]
 mw1307.eqiad.wmnet: [apache2]
 mw1318.eqiad.wmnet: [apache2]
+mw1338.eqiad.wmnet: [apache2]
   jobrunner:
 mw1299.eqiad.wmnet: [apache2,nginx]
 mw1300.eqiad.wmnet: [apache2,nginx]
@@ -69,6 +70,16 @@
 mw1315.eqiad.wmnet: [apache2,nginx]
 mw1316.eqiad.wmnet: [apache2,nginx]
 mw1317.eqiad.wmnet: [apache2,nginx]
+mw1339.eqiad.wmnet: [apache2,nginx]
+mw1340.eqiad.wmnet: [apache2,nginx]
+mw1341.eqiad.wmnet: [apache2,nginx]
+mw1342.eqiad.wmnet: [apache2,nginx]
+mw1343.eqiad.wmnet: [apache2,nginx]
+mw1344.eqiad.wmnet: [apache2,nginx]
+mw1345.eqiad.wmnet: [apache2,nginx]
+mw1346.eqiad.wmnet: [apache2,nginx]
+mw1347.eqiad.wmnet: [apache2,nginx]
+mw1348.eqiad.wmnet: [apache2,nginx]
   appserver:
 mw1209.eqiad.wmnet: [apache2,nginx]
 mw1210.eqiad.wmnet: [apache2,nginx]
diff --git a/manifests/site.pp b/manifests/site.pp
index 967ed6a..576a0ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1499,7 +1499,6 @@
 role(mediawiki::jobrunner)
 }
 
-
 # T165519
 # ROW C eqiad appservers
 node /^mw13(19|2[0-9]|3[0-3])\.eqiad\.wmnet$/ {
@@ -1508,6 +1507,11 @@
 
 # ROW B eqiad api-appservers
 node /^mw13(1[2-7])\.eqiad\.wmnet$/ {
+role(mediawiki::appserver::api)
+}
+
+# ROW C api-appservers
+node /^mw13(39|4[0-8])\.eqiad\.wmnet$/ {
 role(mediawiki::appserver::api)
 }
 
@@ -1526,6 +1530,11 @@
 role(mediawiki::videoscaler)
 }
 
+# ROW C videoscaler
+node 'mw1338.eqiad.wmnet' {
+role(mediawiki::videoscaler)
+}
+
 
 # ROW A codfw appservers: mw2017, mw2075-mw2079, and mw2215-2250
 
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index dd88d5c..65e8ff6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4764,6 +4764,8 @@
 host mw1338 {
 hardware ethernet 18:66:DA:99:52:38;
 fixed-address mw1338.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mw1339 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I688a90b1cb671f8b964d2541908ce2ef833512f7
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: add mw1338->48

2018-01-12 Thread Elukey (Code Review) 
Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403928 )

Change subject: site.pp: add mw1338->48
..

site.pp: add mw1338->48

Bug: T165519
Change-Id: I688a90b1cb671f8b964d2541908ce2ef833512f7
---
M manifests/site.pp
1 file changed, 27 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/403928/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 8803b67..349bcdc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1494,21 +1494,9 @@
 role(mediawiki::jobrunner)
 }
 
-# ROW C eqiad jobrunners
-node /^mw133[4-7]\.eqiad\.wmnet$/ {
-role(mediawiki::jobrunner)
-}
-
-
-# T165519
-# ROW C eqiad appservers
-node /^mw13(19|2[0-9]|3[0-3])\.eqiad\.wmnet$/ {
-role(mediawiki::appserver)
-}
-
-# ROW B eqiad api-appservers
-node /^mw13(1[2-7])\.eqiad\.wmnet$/ {
-role(mediawiki::appserver::api)
+# ROW A videoscaler
+node 'mw1307.eqiad.wmnet' {
+role(mediawiki::videoscaler)
 }
 
 # ROW A eqiad jobrunners
@@ -1516,9 +1504,9 @@
 role(mediawiki::jobrunner)
 }
 
-# ROW A videoscaler
-node 'mw1307.eqiad.wmnet' {
-role(mediawiki::videoscaler)
+# ROW B eqiad api-appservers
+node /^mw13(1[2-7])\.eqiad\.wmnet$/ {
+role(mediawiki::appserver::api)
 }
 
 # ROW B videoscaler
@@ -1526,6 +1514,27 @@
 role(mediawiki::videoscaler)
 }
 
+# T165519
+# ROW C eqiad appservers
+node /^mw13(19|2[0-9]|3[0-3])\.eqiad\.wmnet$/ {
+role(mediawiki::appserver)
+}
+
+# ROW C eqiad jobrunners
+node /^mw133[4-7]\.eqiad\.wmnet$/ {
+role(mediawiki::jobrunner)
+}
+
+# ROW C videoscaler
+node 'mw1338.eqiad.wmnet' {
+role(mediawiki::videoscaler)
+}
+
+# ROW C api-appservers
+node /^mw13(39|4[0-8])\.eqiad\.wmnet$/ {
+role(mediawiki::appserver::api)
+}
+
 
 # ROW A codfw appservers: mw2017, mw2075-mw2079, and mw2215-2250
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I688a90b1cb671f8b964d2541908ce2ef833512f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 

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