ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94138
Change subject: remove tmh1/2 from everything, decommed (rt #6222)
......................................................................
remove tmh1/2 from everything, decommed (rt #6222)
Change-Id: Ica98ad6997ebc36738e175147b98692f1d27098a
---
M files/dsh/group/mediawiki-installation
M files/dsh/group/mw-pmtpa
M manifests/ganglia.pp
M manifests/site.pp
4 files changed, 0 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/94138/1
diff --git a/files/dsh/group/mediawiki-installation
b/files/dsh/group/mediawiki-installation
index 7f72989..75b334a 100644
--- a/files/dsh/group/mediawiki-installation
+++ b/files/dsh/group/mediawiki-installation
@@ -205,8 +205,6 @@
snapshot1002
snapshot1003
snapshot1004
-tmh1
-tmh2
tmh1001
tmh1002
mw1001
diff --git a/files/dsh/group/mw-pmtpa b/files/dsh/group/mw-pmtpa
index 0b00448..6ea3044 100644
--- a/files/dsh/group/mw-pmtpa
+++ b/files/dsh/group/mw-pmtpa
@@ -196,5 +196,3 @@
snapshot2
snapshot3
snapshot4
-tmh1
-tmh2
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 152622f..322052e 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -286,7 +286,6 @@
default: {
$data_sources = {
"Decommissioned servers pmtpa" =>
"eiximenis.wikimedia.org",
- "Video scalers pmtpa" => "tmh1.pmtpa.wmnet
tmh2.pmtpa.wmnet",
"Video scalers eqiad" =>
"tmh1001.eqiad.wmnet tmh1002.eqiad.wmnet",
"Image scalers pmtpa" => "mw75.pmtpa.wmnet
mw76.pmtpa.wmnet",
"API application servers pmtpa" =>
"srv254.pmtpa.wmnet srv255.pmtpa.wmnet",
diff --git a/manifests/site.pp b/manifests/site.pp
index fd0c11b..ed9b499 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2811,17 +2811,6 @@
backup::server
}
-# tmh1/tmh2 video encoding server (precise only)
-node /^tmh[1-2]\.pmtpa\.wmnet/ {
- if $hostname =~ /^tmh[12]$/ {
- $ganglia_aggregator = true
- }
-
- class { role::applicationserver::videoscaler: run_jobs_enabled => false }
-
- include nfs::upload
-}
-
# tmh1001/tmh1002 video encoding server (precise only)
node /^tmh100[1-2]\.eqiad\.wmnet/ {
if $hostname =~ /^tmh100[12]$/ {
--
To view, visit https://gerrit.wikimedia.org/r/94138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica98ad6997ebc36738e175147b98692f1d27098a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
