Filippo Giunchedi has submitted this change and it was merged.
Change subject: claim mw129[12] for thumbor
......................................................................
claim mw129[12] for thumbor
Bug: T139606
Change-Id: Ie7f2508b3d192f33a618c63f4e4ee5b8519afbf3
---
M conftool-data/nodes/eqiad.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/scap/files/dsh/group/mediawiki-installation
5 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index e63f27d..9cd5d18 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -230,8 +230,6 @@
mw1158.eqiad.wmnet: [apache2]
mw1159.eqiad.wmnet: [apache2]
mw1160.eqiad.wmnet: [apache2]
- mw1291.eqiad.wmnet: [apache2]
- mw1292.eqiad.wmnet: [apache2]
mw1293.eqiad.wmnet: [apache2]
mw1294.eqiad.wmnet: [apache2]
mw1295.eqiad.wmnet: [apache2]
diff --git a/manifests/site.pp b/manifests/site.pp
index 36d214c..8f09ff2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2185,7 +2185,7 @@
}
# ROW A eqiad imagescalers
-node /^mw129[1-8]\.eqiad\.wmnet$/ {
+node /^mw129[3-8]\.eqiad\.wmnet$/ {
role mediawiki::imagescaler
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 1a33a09..c84ef34 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -141,6 +141,7 @@
snapshot100[5-7]) echo partman/lvm-ext-srv.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
tin) echo partman/lvm-tin.cfg ;; \
+ thumbor*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
virt101[0-2]) echo partman/virt-hp.cfg ;; \
wdqs100[1-9]) echo partman/lvm-wdqs.cfg ;; \
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 6fde9d7..ac72a8e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4782,14 +4782,14 @@
fixed-address mw1290.eqiad.wmnet;
}
-host mw1291 {
+host thumbor1001 {
hardware ethernet 14:18:77:61:3C:D3;
- fixed-address mw1291.eqiad.wmnet;
+ fixed-address thumbor1001.eqiad.wmnet;
}
-host mw1292 {
+host thumbor1002 {
hardware ethernet 14:18:77:61:B0:87;
- fixed-address mw1292.eqiad.wmnet;
+ fixed-address thumbor1002.eqiad.wmnet;
}
host mw1293 {
diff --git a/modules/scap/files/dsh/group/mediawiki-installation
b/modules/scap/files/dsh/group/mediawiki-installation
index da6ecc1..7992e6c 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -194,8 +194,6 @@
mw1288.eqiad.wmnet
mw1289.eqiad.wmnet
mw1290.eqiad.wmnet
-mw1291.eqiad.wmnet
-mw1292.eqiad.wmnet
mw1293.eqiad.wmnet
mw1294.eqiad.wmnet
mw1295.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/301108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f2508b3d192f33a618c63f4e4ee5b8519afbf3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
