Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185965
Change subject: mediawiki: Introduce feature flag to enable/disable lvs
......................................................................
mediawiki: Introduce feature flag to enable/disable lvs
Since labs doesn't support LVS yet
Bug: T87210
Change-Id: I0b84083645ae14b4479e1b5ed094b666b76ac43d
---
M manifests/role/mediawiki.pp
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/185965/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 1e79e65..771f77c 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -58,7 +58,6 @@
class role::mediawiki::webserver($pool) {
include ::role::mediawiki::common
include ::apache::monitoring
- include ::lvs::configuration
include ::mediawiki::web
# HACK: Fix to not be different classes!
if $::realm == 'production' {
@@ -67,10 +66,13 @@
include ::mediawiki::web::beta_sites
}
- $ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
+ if hiera('has_lvs', true) {
+ include ::lvs::configuration
+ $ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
- class { 'lvs::realserver':
- realserver_ips => $ips,
+ class { 'lvs::realserver':
+ realserver_ips => $ips,
+ }
}
ferm::service { 'mediawiki-http':
--
To view, visit https://gerrit.wikimedia.org/r/185965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b84083645ae14b4479e1b5ed094b666b76ac43d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
