RobH has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366877 )
Change subject: decom netmon1001
......................................................................
decom netmon1001
removing for decom
Bug: T171018
Change-Id: Ic068d9a27290ba3cea22362ddaa9f91ffcbb7747
---
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(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
RobH: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 39acd96..da5d799 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1781,12 +1781,6 @@
interface::add_ip6_mapped { 'main': }
}
-# to be decom'ed (T171018)
-node 'netmon1001.wikimedia.org' {
- role(spare::system)
- interface::add_ip6_mapped { 'main': }
-}
-
# network monitoring tools, stretch (T125020, T166180)
node /^netmon(1002|2001)\.wikimedia\.org$/ {
role(network::monitor, librenms, rancid, smokeping)
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 45df17f..97aa3b2 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -134,7 +134,6 @@
osmium) echo partman/mw-raid1.cfg ;; \
mw[0-9]*) echo partman/mw.cfg ;; \
mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
- netmon1001) echo partman/lvm-ext-srv.cfg ;; \
labservices1001|labservices1002|radium|silver|uranium) echo
partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
ores[12]00[1-9]) echo partman/raid1-lvm-ext4-srv-noswap.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 d4b2214..49f4c49 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5534,11 +5534,6 @@
fixed-address nescio.wikimedia.org;
}
-host netmon1001 {
- hardware ethernet 84:2b:2b:51:91:ff;
- fixed-address netmon1001.wikimedia.org;
-}
-
host netmon1002 {
hardware ethernet 18:66:da:9f:80:08;
fixed-address netmon1002.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/366877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic068d9a27290ba3cea22362ddaa9f91ffcbb7747
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@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
