Mark Bergsma has submitted this change and it was merged.
Change subject: mobile always uses role::cache::configuration
......................................................................
mobile always uses role::cache::configuration
We used to setup the backends in role::cache::mobile using
lvs::configuration::lvs_service_ips. Since we do not have LVS in labs,
that caused a bit of havoc by pointing the backends to a fake IP.
Instead, fill in the lvs_service_ips in the role::cache::configuration
which let us specifiy the proper backends to be used for the beta
cluster.
Change-Id: I19e5ec633a96a942e5c0cb465944eea33547f60d
---
M manifests/role/cache.pp
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 9863812..b30302c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -300,6 +300,8 @@
$backends = {
'production' => {
+ 'apaches' =>
$lvs::configuration::lvs_service_ips['production']['apaches'],
+ 'api' =>
$lvs::configuration::lvs_service_ips['production']['api'],
'bits_appservers' => {
'pmtpa' => [ "srv248.pmtpa.wmnet",
"srv249.pmtpa.wmnet", "mw60.pmtpa.wmnet", "mw61.pmtpa.wmnet" ],
'eqiad' => [ "mw1149.eqiad.wmnet",
"mw1150.eqiad.wmnet", "mw1151.eqiad.wmnet", "mw1152.eqiad.wmnet" ],
@@ -310,6 +312,18 @@
},
},
'labs' => {
+ 'apaches' => {
+ 'pmtpa' => [
+ '10.4.0.166', #
deployment-apache32
+ '10.4.0.187', #
deployment-apache33
+ ],
+ },
+ 'api' => {
+ 'pmtpa' => [
+ '10.4.0.166', #
deployment-apache32
+ '10.4.0.187', #
deployment-apache33
+ ],
+ },
'bits_appservers' => {
'pmtpa' => [
'10.4.0.166', #
deployment-apache32
@@ -661,8 +675,8 @@
admin_port => 6083,
storage => "-s
sda3=persistent,/srv/sda3/varnish.persist,100G -s
sdb3=persistent,/srv/sdb3/varnish.persist,100G",
directors => {
- "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['apaches'][$::mw_primary],
- "api" =>
$lvs::configuration::lvs_service_ips[$::realm]['api'][$::mw_primary],
+ "backend" =>
$role::cache::configuration::backends[$::realm]['apaches'][$::mw_primary],
+ "api" =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
},
director_options => {
'retries' => 2,
--
To view, visit https://gerrit.wikimedia.org/r/54864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19e5ec633a96a942e5c0cb465944eea33547f60d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
