Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: HAT: remove the last references to the hhvm pool
......................................................................
HAT: remove the last references to the hhvm pool
Also, remove a couple of ganglia aggregators
Change-Id: I4c638f791d61a7730fd96f6b00f9b669df458525
---
M manifests/ganglia.pp
M manifests/role/ganglia.pp
M manifests/role/mediawiki.pp
M manifests/site.pp
4 files changed, 1 insertion(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 349ee78..1701b3c 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -84,9 +84,6 @@
'api_appserver' => {
'name' => 'API application servers',
'ip_oct' => '13' },
- 'appserver_hhvm' => {
- 'name' => 'HHVM Appservers',
- 'ip_oct' => '14'},
'pdf' => {
'name' => 'PDF servers',
'ip_oct' => '15' },
@@ -303,7 +300,6 @@
'Image scalers eqiad' => 'mw1153.eqiad.wmnet
mw1154.eqiad.wmnet',
'API application servers eqiad' => 'mw1114.eqiad.wmnet
mw1115.eqiad.wmnet',
'Application servers eqaid' => 'mw1054.eqiad.wmnet
mw1055.eqiad.wmnet',
- 'HHVM Appservers eqiad' => 'mw1017.eqiad.wmnet
mw1018.eqiad.wmnet',
'Jobrunners eqiad' => 'mw1001.eqiad.wmnet
mw1002.eqiad.wmnet',
'MySQL' => 'db1050.eqiad.wmnet',
'PDF servers eqiad' => 'ocg1001.eqiad.wmnet',
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index 449ad22..211db46 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -7,7 +7,6 @@
'Image scalers eqiad' => 'mw1153.eqiad.wmnet
mw1154.eqiad.wmnet',
'API application servers eqiad' => 'mw1114.eqiad.wmnet
mw1115.eqiad.wmnet',
'Application servers eqaid' => 'mw1054.eqiad.wmnet
mw1055.eqiad.wmnet',
- 'HHVM Appservers eqiad' => 'mw1017.eqiad.wmnet
mw1018.eqiad.wmnet',
'Jobrunners eqiad' => 'mw1001.eqiad.wmnet
mw1002.eqiad.wmnet',
'MySQL' => 'db1050.eqiad.wmnet',
'PDF servers eqiad' => 'ocg1001.eqiad.wmnet',
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 8b13b54..5e6cb51 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -1,4 +1,3 @@
-@monitoring::group { 'appserver_hhvm_eqiad': description => 'eqiad
application servers (HHVM)' }
@monitoring::group { 'appserver_eqiad': description => 'eqiad application
servers' }
@monitoring::group { 'api_appserver_eqiad': description => 'eqiad API
application servers' }
@monitoring::group { 'imagescaler_eqiad': description => 'eqiad image
scalers' }
diff --git a/manifests/site.pp b/manifests/site.pp
index 171afbc..37c356a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1971,7 +1971,7 @@
class {'::admin': groups => ['deployment']}
- if $::hostname =~ /^mw10(1[78]|5[45])$/ {
+ if $::hostname =~ /^mw10(5[45])$/ {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/176939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c638f791d61a7730fd96f6b00f9b669df458525
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
