RobH has submitted this change and it was merged.
Change subject: reclaiming old hosts, removing cruft from decom list
......................................................................
reclaiming old hosts, removing cruft from decom list
Change-Id: I69523ac9dd9d815a7784d41efbe08f6569ec6d46
---
M manifests/decommissioning.pp
M manifests/site.pp
2 files changed, 3 insertions(+), 105 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index eee8fe0..e8b3b50 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -3,15 +3,8 @@
# ALPHABETIC order!
$decommissioned_servers = [
-'adler',
'barium',
-'bayes',
-'bellin',
-'blondel',
'br1-knams',
-'celsus',
-'cerium',
-'colby',
'constable',
'controller',
'cp1021',
@@ -34,77 +27,9 @@
'cp1042',
'cp3001',
'cp3002',
-'db1',
-'db2',
-'db3',
-'db4',
-'db5',
-'db7',
-'db8',
-'db10',
-'db11',
-'db12',
-'db13',
-'db14',
-'db15',
-'db16',
-'db17',
-'db18',
-'db19',
-'db20',
-'db21',
-'db22',
-'db23',
-'db24',
-'db25',
-'db27',
-'db26',
-'db28',
-'db30',
-'db41',
-'db78', #moved to frack.eqiad 7-15-13
-'db1008', #moved to frack.eqiad 7-25-13
-'db1013', #moved to frack.eqiad 6-7-13
'dysprosium',
-'ixia',
-'gilman',
-'grosley', #moved to frack.eqiad 7-15-13
-'knsq1',
-'knsq2',
-'knsq3',
-'knsq4',
-'knsq5',
-'knsq6',
-'knsq7',
-'knsq8',
-'knsq9',
-'knsq10',
-'knsq11',
-'knsq12',
-'knsq13',
-'knsq14',
-'knsq15',
-'knsq16',
-'knsq17',
-'knsq18',
-'knsq19',
-'knsq20',
-'knsq21',
-'knsq22',
-'knsq23',
-'knsq24',
-'knsq25',
-'knsq26',
-'knsq27',
-'knsq28',
-'knsq29',
-'knsq30',
-'kuo',
'labstore1002', #added 9/17 to remove from monitoring
'labstore4', #added 9/17 to remove from monitoring
-'lardner',
-'lily',
-'lomaria',
'mc2',
'mc3',
'mc4',
@@ -130,25 +55,7 @@
'ms3',
'ms4',
'msfe1002',
-'ocg1',
-'ocg2',
-'ocg3',
-'rdb1',
-'rdb2',
-'searchidx1',
-'search1',
-'search2',
-'search3',
-'search4',
-'search5',
-'search6',
-'search7',
-'search8',
-'search9',
-'search10',
-'search11',
-'search12',
-'singer',
+'praseodymium', #2013-08-29 reclaim to spare by robh
'spence',
'sq31',
'sq32',
@@ -320,7 +227,7 @@
'storage2',
'storage3',
'thistle',
-'titantium',
+'titanium', #2013-08-29 reclaim to spare by robh
'tola',
'virt1001',
'virt1002',
@@ -330,4 +237,5 @@
'virt4',
'wikinews-lb.wikimedia.org',
'wtp1',
+'xenon', #2013-08-29 reclaim to spare by robh
]
diff --git a/manifests/site.pp b/manifests/site.pp
index 715b5fb..eb6659b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2920,10 +2920,6 @@
include role::otrs
}
-node /(cerium|titanium)\.wikimedia\.org/ {
- include standard
-}
-
node /^wtp10(0[1-9]|1[0-9]|2[0-4])\.eqiad\.wmnet$/ {
$cluster = "parsoid"
$nagios_group = "${cluster}_$::site"
@@ -2952,12 +2948,6 @@
node /^solr(100)?[1-3]\.(eqiad|pmtpa)\.wmnet/ {
include standard,
role::solr::geodata
-}
-
-## 2013-06-12
-## peter using xenon for galera cluster testing
-node "xenon.eqiad.wmnet" {
- include standard
}
node "ytterbium.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/86166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69523ac9dd9d815a7784d41efbe08f6569ec6d46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
