Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: lvs: remove the HHVM specialized pools
......................................................................
lvs: remove the HHVM specialized pools
Change-Id: I831a105ef4f01b1e7857f1ad97e9e252e9617abe
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 0 insertions(+), 42 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 13a2cdc..0c6192a 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -36,9 +36,7 @@
],
/^(lvs100[36])$/ => [
$sip['apaches'][$::site],
- $sip['hhvm_appservers'][$::site],
$sip['api'][$::site],
- $sip['hhvm_api'][$::site],
$sip['rendering'][$::site],
$sip['search_pool1'][$::site],
$sip['search_pool2'][$::site],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index e6e9dee..5a824d2 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -124,17 +124,11 @@
'apaches' => {
'eqiad' => "10.2.2.1",
},
- 'hhvm_appservers' => {
- 'eqiad' => "10.2.2.2",
- },
'rendering' => {
'eqiad' => "10.2.2.21",
},
'api' => {
'eqiad' => "10.2.2.22",
- },
- 'hhvm_api' => {
- 'eqiad' => "10.2.2.3",
},
'search_pool1' => {
'eqiad' => "10.2.2.11",
@@ -199,10 +193,6 @@
'text' => {
},
'apaches' => {
- },
- 'hhvm_appservers' => {
- },
- 'hhvm_apaches' => {
},
'rendering' => {
},
@@ -547,21 +537,6 @@
'RunCommand' => $runcommand_monitor_options
},
},
- "hhvm_appservers" => {
- 'description' => "Main MediaWiki application server cluster
(HHVM), hhvm-appservers.svc.eqiad.wmnet",
- 'class' => "low-traffic",
- 'sites' => [ "eqiad" ],
- 'ip' => $service_ips['hhvm_appservers'][$::site],
- 'bgp' => "yes",
- 'depool-threshold' => ".3",
- 'monitors' => {
- 'ProxyFetch' => {
- 'url' => [ 'http://en.wikipedia.org/wiki/Main_Page' ],
- },
- 'IdleConnection' => $idleconnection_monitor_options,
- 'RunCommand' => $runcommand_monitor_options
- },
- },
"rendering" => {
'description' => "MediaWiki thumbnail rendering cluster,
rendering.svc.eqiad.wmnet",
'class' => "low-traffic",
@@ -588,21 +563,6 @@
'ProxyFetch' => {
'url' => [ 'http://en.wikipedia.org/w/api.php' ],
},
- 'IdleConnection' => $idleconnection_monitor_options,
- 'RunCommand' => $runcommand_monitor_options
- },
- },
- "hhvm_api" => {
- 'description' => "MediaWiki API cluster (HHVM),
hhvm-api.svc.eqiad.wmnet",
- 'class' => "low-traffic",
- 'sites' => [ "eqiad" ],
- 'ip' => $service_ips['hhvm_api'][$::site],
- 'bgp' => "yes",
- 'depool-threshold' => ".6",
- 'monitors' => {
- 'ProxyFetch' => {
- 'url' => [ 'http://en.wikipedia.org/w/api.php' ],
- },
'IdleConnection' => $idleconnection_monitor_options,
'RunCommand' => $runcommand_monitor_options
},
--
To view, visit https://gerrit.wikimedia.org/r/175434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I831a105ef4f01b1e7857f1ad97e9e252e9617abe
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
