Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/49831
Change subject: beta: lvs fake config for upload caches
......................................................................
beta: lvs fake config for upload caches
Update the lvs::configuration hash to add up the beta apaches as
backends.
A previous patchet forgot a level in the hash (uploadlb/uploadsvc were
missing).
I am not sure of the impacts on production.
Change-Id: I739930ef8bde64ae176046355b3d1620153d2d61
---
M manifests/lvs.pp
M manifests/role/cache.pp
2 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/49831/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 4855efa..997f5e0 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -380,7 +380,8 @@
'pmtpa' => "10.4.0.254",
},
'rendering' => {
- 'pmtpa' => "10.4.0.252",
+ # Used to be 10.4.0.252
+ 'pmtpa' => [ '10.4.0.166', '10.4.0.187', ],
},
'api' => {
'pmtpa' => "10.4.0.253",
@@ -406,10 +407,10 @@
'swift' => {},
'payments' => {},
'upload' => {
- 'pmtpa' => [
- '10.4.0.166', # deployment-apache32
- '10.4.0.187', # deployment-apache33
- ],
+ 'pmtpa' => {
+ 'uploadlb' => [ '10.4.0.166',
'10.4.0.187', ],
+ 'uploadsvc' => [ '10.4.0.166',
'10.4.0.187', ],
+ },
},
'parsoid' => {},
}
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index c01bc38..e3314d8 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -371,13 +371,18 @@
class { "lvs::realserver": realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['upload'][$::site] }
$varnish_fe_directors = {
- "pmtpa" => {},
+ # pmtpa is for labs / beta cluster
+ "pmtpa" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['upload'][$::site] },
"eqiad" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['upload'][$::site] },
# TODO: replace after removing Squid
"esams" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['upload']["${::site}-varnish"]
},
}
$varnish_be_directors = {
+ "pmtpa" => {
+ "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['upload']['pmtpa']['uploadsvc'],
+ "image_scalers" =>
$lvs::configuration::lvs_service_ips[$::realm]['rendering'][$::mw_primary],
+ },
"eqiad" => {
"backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['upload']['pmtpa']['uploadsvc'],
"swift" =>
$lvs::configuration::lvs_service_ips[$::realm]['swift']['pmtpa'],
--
To view, visit https://gerrit.wikimedia.org/r/49831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I739930ef8bde64ae176046355b3d1620153d2d61
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
