Dzahn has submitted this change and it was merged.
Change subject: remove 'maerlant' from site.pp/dsh/dhcp
......................................................................
remove 'maerlant' from site.pp/dsh/dhcp
it's currently down, but it doesn't really do anything,
it appears
decom, but for repurposing it for something else
see
RT #7539
Change-Id: Ic1b01297786bd433b5b0f0e23888b62203d5da06
---
M files/dsh/group/misc_esams
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/dsh/group/misc_esams b/files/dsh/group/misc_esams
index 0fab1ea..0e0bd6b 100644
--- a/files/dsh/group/misc_esams
+++ b/files/dsh/group/misc_esams
@@ -1,6 +1,5 @@
eeden
hooft
-maerlant
multatuli
nescio
slauerhoff
diff --git a/manifests/site.pp b/manifests/site.pp
index ac36213..a838ed0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1705,10 +1705,6 @@
}
}
-node 'maerlant.esams.wikimedia.org' {
- include standard
-}
-
node 'magnesium.wikimedia.org' {
$cluster = 'misc'
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 186ec66..285430c 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1426,11 +1426,6 @@
fixed-address lvs4004.ulsfo.wmnet;
}
-host maerlant {
- hardware ethernet a4:ba:db:30:d1:12;
- fixed-address maerlant.esams.wikimedia.org;
-}
-
host magnesium {
hardware ethernet 78:2b:cb:09:0d:d1;
fixed-address magnesium.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/134745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1b01297786bd433b5b0f0e23888b62203d5da06
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
