Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/90157
Change subject: Removing mc1-16 from dsh group, dhcpd, ganglia.pp, decom.pp
remvoing oc1-3 from site.pp
......................................................................
Removing mc1-16 from dsh group, dhcpd, ganglia.pp, decom.pp remvoing oc1-3 from
site.pp
Change-Id: I63af4e422025b7dac871d0255cf8e39ad856fa15
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M files/dsh/group/mc_pmtpa
M manifests/decommissioning.pp
M manifests/site.pp
4 files changed, 2 insertions(+), 125 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/90157/1
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index f1352ac..54342ca 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1667,86 +1667,6 @@
fixed-address marmontel.wikimedia.org;
}
-host mc1 {
- hardware ethernet 90:e2:ba:19:55:f0;
- fixed-address mc1.pmtpa.wmnet;
-}
-
-host mc2 {
- hardware ethernet 90:e2:ba:19:4e:c8;
- fixed-address mc2.pmtpa.wmnet;
-}
-
-host mc3 {
- hardware ethernet 90:e2:ba:19:54:10;
- fixed-address mc3.pmtpa.wmnet;
-}
-
-host mc4 {
- hardware ethernet 90:e2:ba:19:56:50;
- fixed-address mc4.pmtpa.wmnet;
-}
-
-host mc5 {
- hardware ethernet 90:e2:ba:19:56:f4;
- fixed-address mc5.pmtpa.wmnet;
-}
-
-host mc6 {
- hardware ethernet 90:e2:ba:19:4e:30;
- fixed-address mc6.pmtpa.wmnet;
-}
-
-host mc7 {
- hardware ethernet 90:e2:ba:19:51:d8;
- fixed-address mc7.pmtpa.wmnet;
-}
-
-host mc8 {
- hardware ethernet 90:e2:ba:19:58:9c;
- fixed-address mc8.pmtpa.wmnet;
-}
-
-host mc9 {
- hardware ethernet 90:e2:ba:19:56:70;
- fixed-address mc9.pmtpa.wmnet;
-}
-
-host mc10 {
- hardware ethernet 90:e2:ba:19:50:dc;
- fixed-address mc10.pmtpa.wmnet;
-}
-
-host mc11 {
- hardware ethernet 90:e2:ba:19:53:fc;
- fixed-address mc11.pmtpa.wmnet;
-}
-
-host mc12 {
- hardware ethernet 90:e2:ba:19:4f:b4;
- fixed-address mc12.pmtpa.wmnet;
-}
-
-host mc13 {
- hardware ethernet 90:e2:ba:19:50:b8;
- fixed-address mc13.pmtpa.wmnet;
-}
-
-host mc14 {
- hardware ethernet 90:e2:ba:19:55:b8;
- fixed-address mc14.pmtpa.wmnet;
-}
-
-host mc15 {
- hardware ethernet 90:e2:ba:1d:47:c0;
- fixed-address mc15.pmtpa.wmnet;
-}
-
-host mc16 {
- hardware ethernet 90:e2:ba:19:4e:48;
- fixed-address mc16.pmtpa.wmnet;
-}
-
host mc1001 {
hardware ethernet 00:1b:21:7a:88:0b;
fixed-address mc1001.eqiad.wmnet;
diff --git a/files/dsh/group/mc_pmtpa b/files/dsh/group/mc_pmtpa
index 94ac53a..8b13789 100644
--- a/files/dsh/group/mc_pmtpa
+++ b/files/dsh/group/mc_pmtpa
@@ -1,16 +1 @@
-mc1
-mc2
-mc3
-mc4
-mc5
-mc6
-mc7
-mc8
-mc9
-mc10
-mc11
-mc12
-mc13
-mc14
-mc15
-mc16
+
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index cb083fd..1582be3 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -26,21 +26,6 @@
'cp3001',
'cp3002',
'dysprosium',
-'mc2',
-'mc3',
-'mc4',
-'mc5',
-'mc6',
-'mc7',
-'mc8',
-'mc9',
-'mc10',
-'mc11',
-'mc12',
-'mc13',
-'mc14',
-'mc15',
-'mc16',
'ms1',
'ms2',
'ms3',
@@ -60,7 +45,7 @@
'sq45',
'sq46',
'sq47',
-'ssl3004', #added 9/17 to remove from monitoring
+'ssl3004', #added 9/17
'virt1001',
'virt1002',
'virt1003',
diff --git a/manifests/site.pp b/manifests/site.pp
index 1f05419..5dcbd28 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2200,19 +2200,6 @@
}
}
-node /^ocg[1-3]\.wikimedia\.org$/ {
-
- # online collection generator
-
- system_role { "misc::mwlib": description => "offline collection generator"
}
-
- include standard,
- admins::roots,
- misc::mwlib::packages,
- misc::mwlib::users
-
-}
-
node /^osm-cp100[1-4]\.wikimedia\.org$/ {
include standard-noexim
}
--
To view, visit https://gerrit.wikimedia.org/r/90157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63af4e422025b7dac871d0255cf8e39ad856fa15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
