Filippo Giunchedi has submitted this change and it was merged.
Change subject: lvs: add thumbor to lvs
......................................................................
lvs: add thumbor to lvs
There will be nginx listening on port 8800 and revproxing to multiple thumbor
instances.
Bug: T139606
Change-Id: Ia6c7248b82b385b0425f18d4f3494f77a2a8eac0
---
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M modules/role/manifests/lvs/balancer.pp
M modules/role/manifests/thumbor/mediawiki.pp
5 files changed, 45 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index b125f94..ee4b428 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -251,3 +251,6 @@
eventbus:
kafka1001.eqiad.wmnet: [eventbus]
kafka1002.eqiad.wmnet: [eventbus]
+thumbor:
+ thumbor1001.eqiad.wmnet: [thumbor]
+ thumbor1002.eqiad.wmnet: [thumbor]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 6106e45..173ea8b 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -141,3 +141,11 @@
default_values:
pooled: 'yes'
weight: 10
+thumbor:
+ thumbor:
+ port: 8800
+ datacenters:
+ - eqiad
+ default_values:
+ pooled: 'no'
+ weight: 10
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 795cc54..658dd8c 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -123,6 +123,9 @@
ores: &ip_block028
eqiad: 10.2.2.10
codfw: 10.2.1.10
+ thumbor: &ip_block029
+ eqiad: 10.2.2.24
+ codfw: 10.2.1.24
lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -924,3 +927,28 @@
IdleConnection:
max-delay: 300
timeout-clean-reconnect: 3
+ thumbor:
+ description: Thumbor image scaling
+ class: low-traffic
+ sites:
+ - eqiad
+ ip: *ip_block029
+ bgp: 'yes'
+ depool-threshold: '.5'
+ monitors:
+ ProxyFetch:
+ url:
+ - http://localhost/healthcheck
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: thumbor
+ service: thumbor
+ icinga:
+ check_command:
"check_http_lvs_on_port!thumbor.svc.%{::site}.wmnet!8800!/healthcheck"
+ sites:
+ eqiad:
+ hostname: thumbor.svc.eqiad.wmnet
+ codfw:
+ hostname: thumbor.svc.codfw.wmnet
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 952e5ef..50ae67d 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -41,6 +41,7 @@
$sip['eventbus'][$::site],
$sip['apertium'][$::site],
$sip['ores'][$::site],
+ $sip['thumbor'][$::site],
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
@@ -71,6 +72,7 @@
$sip['kartotherian'][$::site],
$sip['eventbus'][$::site],
$sip['ores'][$::site],
+ $sip['thumbor'][$::site],
],
# esams + ulsfo
diff --git a/modules/role/manifests/thumbor/mediawiki.pp
b/modules/role/manifests/thumbor/mediawiki.pp
index fa08f04..01c94a1 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -18,6 +18,10 @@
swift_sharded_containers =>
hiera_array('swift::proxy::shard_container_list'),
}
+ class { 'lvs::realserver':
+ realserver_ips => $lvs::configuration::service_ips['thumbor'][$::site],
+ }
+
ferm::service { 'thumbor':
proto => 'tcp',
port => '8800',
--
To view, visit https://gerrit.wikimedia.org/r/300244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6c7248b82b385b0425f18d4f3494f77a2a8eac0
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
