Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66104
Change subject: Switch role::cache::text to using role::cache::configuration
for content backends
......................................................................
Switch role::cache::text to using role::cache::configuration for content
backends
Change-Id: I4b66f54dfaf7d0b915de62e4977d0bcfe4eb7bed
---
M manifests/role/cache.pp
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/66104/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 216b7eb..b5afcb5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -288,6 +288,7 @@
'production' => {
'apaches' =>
$lvs::configuration::lvs_service_ips['production']['apaches'],
'api' =>
$lvs::configuration::lvs_service_ips['production']['api'],
+ 'rendering' =>
$lvs::configuration::lvs_service_ips['production']['rendering'],
'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" ],
@@ -384,15 +385,15 @@
$varnish_be_directors = {
"pmtpa" => {
- "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['text'][$::mw_primary]['textsvc'],
+ "backend" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
"api" =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
- "image_scalers" =>
$lvs::configuration::lvs_service_ips[$::realm]['rendering'][$::mw_primary],
+ "image_scalers" =>
$role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary],
"test_wikipedia" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
"eqiad" => {
- "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['text'][$::mw_primary]['textsvc'],
+ "backend" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
"api" =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
- "image_scalers" =>
$lvs::configuration::lvs_service_ips[$::realm]['rendering'][$::mw_primary],
+ "image_scalers" =>
$role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary],
"test_wikipedia" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
"esams" => {
--
To view, visit https://gerrit.wikimedia.org/r/66104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b66f54dfaf7d0b915de62e4977d0bcfe4eb7bed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
