Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290236
Change subject: mediawiki: assign new eqiad appservers, install with jessie
......................................................................
mediawiki: assign new eqiad appservers, install with jessie
Bug: T133798, T134309
Change-Id: I87486d84527cd2a0aea35d19756f7f6e3d46b5b8
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 69 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/290236/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 21bd823..f7c494b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2142,6 +2142,43 @@
role mediawiki::videoscaler
}
+
+# ROW A eqiad appservers
+#mw1261 - mw1275
+
+node /^mw126[1-5]\.eqiad\.wmnet$/ {
+ role mediawiki::canary_appserver
+ include base::firewal
+}
+
+node /^mw12(6[6-9]|7[0-5])\.eqiad\.wmnet$/ {
+ role mediawiki::appserver
+ include base::firewal
+}
+
+# ROW A eqiad api appserver
+# mw1276 - mw1290
+node /^mw127[6-9]\.eqiad\.wmnet$/ {
+ role mediawiki::appserver::canary_api
+ include base::firewal
+}
+
+node /^mw12(8[0-9]|90)\.eqiad\.wmnet$/ {
+ role mediawiki::appserver::api
+ include base::firewal
+}
+
+# ROW A eqiad imagescalers
+node /^mw129[1-8]\.eqiad\.wmnet$/ {
+ role mediawiki::imagescaler
+}
+
+# ROW A eqiad jobrunners
+node /^mw1(299|30[0-6])\.eqiad\.wmnet$/ {
+ role mediawiki::jobrunner
+ include base::firewall
+}
+
# ROW A codfw appservers: mw2001-mw2079
#mw2001-mw2006 are jobrunners
node /^mw200[0-6]\.codfw\.wmnet$/ {
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 554a363..25314fd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4836,81 +4836,113 @@
host mw1260 {
hardware ethernet 18:03:73:f1:59:5a;
fixed-address mw1260.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1261 {
hardware ethernet 14:18:77:61:4B:03;
fixed-address mw1261.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1262 {
hardware ethernet 14:18:77:61:3A:1C;
fixed-address mw1262.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1263 {
hardware ethernet 14:18:77:61:3C:2D;
fixed-address mw1263.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1264 {
hardware ethernet 14:18:77:61:3C:1B;
fixed-address mw1264.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1265 {
hardware ethernet 14:18:77:61:38:14;
fixed-address mw1265.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1266 {
hardware ethernet 14:18:77:61:39:8E;
fixed-address mw1266.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1267 {
hardware ethernet 14:18:77:61:48:1F;
fixed-address mw1267.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1268 {
hardware ethernet 14:18:77:61:33:99;
fixed-address mw1268.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1269 {
hardware ethernet 14:18:77:61:3B:AD;
fixed-address mw1269.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1270 {
hardware ethernet 14:18:77:61:3A:22;
fixed-address mw1270.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1271 {
hardware ethernet 14:18:77:61:3E:47;
fixed-address mw1271.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1272 {
hardware ethernet 14:18:77:61:31:6A;
fixed-address mw1272.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1273 {
hardware ethernet 14:18:77:61:36:2B;
fixed-address mw1273.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1274 {
hardware ethernet 14:18:77:61:35:A3;
fixed-address mw1274.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1275 {
hardware ethernet 14:18:77:61:46:45;
fixed-address mw1275.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host mw1276 {
--
To view, visit https://gerrit.wikimedia.org/r/290236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87486d84527cd2a0aea35d19756f7f6e3d46b5b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
