Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363110 )
Change subject: decom subra and suhail
......................................................................
decom subra and suhail
Bug: T169506
Change-Id: I23c39d91c0a65859b602065c79e865638269cf09
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 17 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 1737de2..3536c47 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2159,9 +2159,9 @@
role(snapshot::dumper, snapshot::monitor, snapshot::cronrunner)
}
-# codfw poolcounters
+# formerly codfw poolcounters, now spares
node /(subra|suhail)\.codfw\.wmnet/ {
- role(poolcounter::server)
+ role(spare::system)
}
# mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index cfbe3bd..deeec4b 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -53,7 +53,7 @@
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]|analytics106[0-9])
echo partman/analytics-flex.cfg ;; \
aqs100[456789]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
heze|neodymium|oxygen|terbium) echo partman/lvm.cfg ;; \
- copper|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg ;; \
+ copper|ruthenium|ocg1003) echo partman/raid1-lvm.cfg ;; \
bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
boron) echo partman/lvm.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 261d647..e03025f 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6167,20 +6167,6 @@
fixed-address stat1006.eqiad.wmnet;
}
-host subra {
- hardware ethernet D4:AE:52:AD:62:75;
- fixed-address subra.codfw.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host suhail {
- hardware ethernet 90:B1:1C:00:AE:28;
- fixed-address suhail.codfw.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host tegmen {
hardware ethernet 14:18:77:33:42:F8;
fixed-address tegmen.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/363110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23c39d91c0a65859b602065c79e865638269cf09
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
