Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403215 )
Change subject: decom esams swift machines, rm from puppet/dhcp
......................................................................
decom esams swift machines, rm from puppet/dhcp
Bug: T169518
Change-Id: I43e1816300ea6b880a5fe3eda003afbc73122b40
---
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, 0 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/403215/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 4397bd6..b2c9c5f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1447,14 +1447,6 @@
role(swift::storage)
}
-node /^ms-fe300[1-2]\.esams\.wmnet$/ {
- role(spare::system)
-}
-
-node /^ms-be300[1-4]\.esams\.wmnet$/ {
- role(spare::system)
-}
-
node /^ms-fe2005\.codfw\.wmnet$/ {
role(swift::proxy)
include ::role::swift::stats_reporter
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index d641423..78bf327 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -128,9 +128,7 @@
ms-be101[6-9]|ms-be102[0-9]|ms-be103[0-9]) echo partman/ms-be-hp.cfg
;; \
ms-be201[3-5]) echo partman/ms-be-dell.cfg ;; \
ms-be201[6-9]|ms-be20[2-3][0-9]) echo partman/ms-be-hp.cfg ;; \
- ms-be30[0-9][0-9]) echo partman/ms-be-esams.cfg ;; \
ms-fe[1-2]0[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
- ms-fe30[0-9][0-9]) echo partman/flat.cfg ;; \
mw116[89]) echo partman/mw-no-tmp.cfg ;; \
mw211[89]|mw2152|mw2246) echo partman/mw-no-tmp.cfg ;; \
mw1259) echo partman/mw-raid1.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 3c778da..001acc1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3978,34 +3978,6 @@
filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
-host ms-be3001 {
- hardware ethernet 24:B6:FD:F6:13:AC;
- fixed-address ms-be3001.esams.wmnet;
-}
-
-host ms-be3002 {
- hardware ethernet 24:B6:FD:F6:17:3C;
- fixed-address ms-be3002.esams.wmnet;
-}
-
-host ms-be3003 {
- hardware ethernet 24:B6:FD:F6:17:38;
- fixed-address ms-be3003.esams.wmnet;
-}
-
-host ms-be3004 {
- hardware ethernet 24:B6:FD:F6:1C:3C;
- fixed-address ms-be3004.esams.wmnet;
-}
-
-# ms-be3004's primary NIC is broken and can't PXE(?). The secondary NIC works
-# for PXE, and the primary NIC works otherwise, so add an entry here as to
-# allow for this strange mode of booting the installer.
-host ms-be3004-B {
- hardware ethernet 24:B6:FD:F6:1C:3D;
- fixed-address ms-be3004.esams.wmnet;
-}
-
host ms-fe1005 {
hardware ethernet F4:E9:D4:AE:F4:E0;
fixed-address ms-fe1005.eqiad.wmnet;
@@ -4060,16 +4032,6 @@
fixed-address ms-fe2008.codfw.wmnet;
option pxelinux.pathprefix "stretch-installer/";
filename "stretch-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host ms-fe3001 {
- hardware ethernet 24:B6:FD:F5:B2:84;
- fixed-address ms-fe3001.esams.wmnet;
-}
-
-host ms-fe3002 {
- hardware ethernet 24:B6:FD:F5:B3:E4;
- fixed-address ms-fe3002.esams.wmnet;
}
host multatuli {
--
To view, visit https://gerrit.wikimedia.org/r/403215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43e1816300ea6b880a5fe3eda003afbc73122b40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
