Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Setup LVS for mobileapps service on scb cluster
......................................................................
Setup LVS for mobileapps service on scb cluster
Change-Id: Ifeaec06afac30fe5a17110e1958eb41f8af32187
---
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/role/common/scb.yaml
M modules/role/manifests/lvs/balancer.pp
4 files changed, 159 insertions(+), 126 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 99c0855..955df24 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -2,107 +2,115 @@
swift-fe:
port: 80
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
- - codfw
+ - eqiad
+ - codfw
parsoid:
parsoid:
port: 8000
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
- - codfw
+ - eqiad
+ - codfw
elasticsearch:
elasticsearch:
port: 9200
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
rcstream:
nginx:
port: 80
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
nginx_ssl:
port: 443
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
pdf:
ocg:
port: 8000
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
sca:
mathoid:
port: 10042
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
citoid:
port: 1970
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
cxserver:
port: 8080
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
graphoid:
port: 19000
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
zotero:
port: 7231
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
restbase:
restbase:
port: 7231
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - eqiad
+ - eqiad
maps:
kartotherian:
port: 4000
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - codfw
+ - codfw
tilerator:
port: 4100
default_values:
- "pooled": "no"
- "weight": 10
+ pooled: 'no'
+ weight: 10
datacenters:
- - codfw
+ - codfw
+scb:
+ mobileapps:
+ port: 8888
+ default_values:
+ pooled: 'yes'
+ weight: 10
+ datacenters:
+ - eqiad
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 84a9472..44a8d27 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -1,5 +1,5 @@
lvs_service_ips:
- text: &text
+ text: &ip_block001
codfw:
textlb: 208.80.153.224
textlb6: 2620:0:860:ed1a::1
@@ -12,7 +12,7 @@
ulsfo:
textlb: 198.35.26.96
textlb6: 2620:0:863:ed1a::1
- upload: &upload
+ upload: &ip_block002
codfw:
uploadlb: 208.80.153.240
uploadlb6: 2620:0:860:ed1a::2:b
@@ -25,20 +25,20 @@
ulsfo:
uploadlb: 198.35.26.112
uploadlb6: 2620:0:863:ed1a::2:b
- maps: &maps
+ maps: &ip_block003
eqiad:
mapslb: 208.80.154.244
mapslb6: 2620:0:861:ed1a::2:d
- apaches: &apaches
+ apaches: &ip_block007
eqiad: 10.2.2.1
codfw: 10.2.1.1
- rendering: &rendering
+ rendering: &ip_block008
eqiad: 10.2.2.21
codfw: 10.2.1.21
- api: &api
+ api: &ip_block009
eqiad: 10.2.2.22
codfw: 10.2.1.22
- mobile: &mobile
+ mobile: &ip_block004
codfw:
mobilelb: 208.80.153.236
mobilelb6: 2620:0:860:ed1a::1:c
@@ -51,10 +51,10 @@
ulsfo:
mobilelb: 198.35.26.108
mobilelb6: 2620:0:863:ed1a::1:c
- swift: &swift
+ swift: &ip_block010
eqiad: 10.2.2.27
codfw: 10.2.1.27
- dns_rec: &dns_rec
+ dns_rec: &ip_block005
eqiad:
dns_rec: 208.80.154.239
dns_rec6: 2620:0:861:ed1a::3:fe
@@ -64,39 +64,41 @@
esams:
dns_rec: 91.198.174.216
dns_rec6: 2620:0:862:ed1a::3:fe
- misc_web: &misc_web
+ misc_web: &ip_block006
eqiad:
misc_weblb: 208.80.154.241
misc_weblb6: 2620:0:861:ed1a::11
- parsoid: &parsoid
+ parsoid: &ip_block011
eqiad: 10.2.2.28
- parsoidcache: &parsoidcache
+ parsoidcache: &ip_block012
eqiad:
parsoidcachelb: 208.80.154.248
parsoidcachelb6: 2620:0:861:ed1a::3:14
parsoidsvc: 10.2.2.29
- search: &search
+ search: &ip_block013
eqiad: 10.2.2.30
- stream: &stream
+ stream: &ip_block014
eqiad:
streamlb: 208.80.154.249
streamlb6: 2620:0:861:ed1a::3:15
- ocg: &ocg
+ ocg: &ip_block015
eqiad: 10.2.2.31
- mathoid: &mathoid
+ mathoid: &ip_block016
eqiad: 10.2.2.20
- citoid: &citoid
+ citoid: &ip_block017
eqiad: 10.2.2.19
- cxserver: &cxserver
+ cxserver: &ip_block018
eqiad: 10.2.2.18
- graphoid: &graphoid
+ graphoid: &ip_block019
eqiad: 10.2.2.15
- restbase: &restbase
+ restbase: &ip_block020
eqiad: 10.2.2.17
- zotero: &zotero
+ zotero: &ip_block021
eqiad: 10.2.2.16
- kartotherian: &kartotherian
+ kartotherian: &ip_block022
codfw: 10.2.1.13
+ mobileapps: &ip_block023
+ eqiad: 10.2.2.14
lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -106,9 +108,9 @@
- eqiad
- esams
- ulsfo
- ip: *text
+ ip: *ip_block001
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
conftool:
cluster: cache_text
service: varnish-fe
@@ -133,11 +135,11 @@
- eqiad
- esams
- ulsfo
- ip: *text
+ ip: *ip_block001
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
conftool:
cluster: cache_text
service: nginx
@@ -156,9 +158,9 @@
- eqiad
- esams
- ulsfo
- ip: *upload
+ ip: *ip_block002
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -183,11 +185,11 @@
- eqiad
- esams
- ulsfo
- ip: *upload
+ ip: *ip_block002
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -203,9 +205,9 @@
class: high-traffic2
sites:
- eqiad
- ip: *maps
+ ip: *ip_block003
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -218,11 +220,11 @@
class: high-traffic2
sites:
- eqiad
- ip: *maps
+ ip: *ip_block003
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -241,9 +243,9 @@
- eqiad
- esams
- ulsfo
- ip: *mobile
+ ip: *ip_block004
bgp: 'yes'
- depool-threshold: ".6"
+ depool-threshold: '.6'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -268,11 +270,11 @@
- eqiad
- esams
- ulsfo
- ip: *mobile
+ ip: *ip_block004
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".6"
+ depool-threshold: '.6'
monitors:
ProxyFetch:
url:
@@ -291,10 +293,10 @@
- codfw
- esams
protocol: udp
- ip: *dns_rec
+ ip: *ip_block005
port: 53
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
DNSQuery:
hostnames:
@@ -315,10 +317,10 @@
- codfw
- esams
protocol: tcp
- ip: *dns_rec
+ ip: *ip_block005
port: 53
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
DNSQuery:
hostnames:
@@ -336,9 +338,9 @@
class: high-traffic2
sites:
- eqiad
- ip: *misc_web
+ ip: *ip_block006
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -356,11 +358,11 @@
class: high-traffic2
sites:
- eqiad
- ip: *misc_web
+ ip: *ip_block006
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -374,9 +376,9 @@
sites:
- eqiad
- codfw
- ip: *apaches
+ ip: *ip_block007
bgp: 'yes'
- depool-threshold: ".9"
+ depool-threshold: '.9'
monitors:
ProxyFetch:
url:
@@ -403,9 +405,9 @@
sites:
- eqiad
- codfw
- ip: *rendering
+ ip: *ip_block008
bgp: 'yes'
- depool-threshold: ".74"
+ depool-threshold: '.74'
monitors:
ProxyFetch:
url:
@@ -432,9 +434,9 @@
sites:
- eqiad
- codfw
- ip: *api
+ ip: *ip_block009
bgp: 'yes'
- depool-threshold: ".6"
+ depool-threshold: '.6'
monitors:
ProxyFetch:
url:
@@ -461,9 +463,9 @@
sites:
- codfw
- eqiad
- ip: *swift
+ ip: *ip_block010
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -484,10 +486,10 @@
class: low-traffic
sites:
- eqiad
- ip: *parsoid
+ ip: *ip_block011
port: 8000
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -509,10 +511,10 @@
class: high-traffic2
sites:
- eqiad
- ip: *parsoidcache
+ ip: *ip_block012
port: 80
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -534,11 +536,11 @@
class: high-traffic2
sites:
- eqiad
- ip: *parsoidcache
+ ip: *ip_block012
port: 443
scheduler: sh
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -551,10 +553,10 @@
class: low-traffic
sites:
- eqiad
- ip: *search
+ ip: *ip_block013
port: 9200
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -575,10 +577,10 @@
class: high-traffic2
sites:
- eqiad
- ip: *stream
+ ip: *ip_block014
port: 80
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
scheduler: sh
monitors:
ProxyFetch:
@@ -595,10 +597,10 @@
class: high-traffic2
sites:
- eqiad
- ip: *stream
+ ip: *ip_block014
port: 443
bgp: 'no'
- depool-threshold: ".5"
+ depool-threshold: '.5'
scheduler: sh
monitors:
ProxyFetch:
@@ -615,10 +617,10 @@
class: high-traffic2
sites:
- eqiad
- ip: *ocg
+ ip: *ip_block015
port: 8000
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -639,10 +641,10 @@
class: low-traffic
sites:
- eqiad
- ip: *mathoid
+ ip: *ip_block016
port: 10042
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -663,10 +665,10 @@
class: low-traffic
sites:
- eqiad
- ip: *citoid
+ ip: *ip_block017
port: 1970
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -688,10 +690,10 @@
class: low-traffic
sites:
- eqiad
- ip: *cxserver
+ ip: *ip_block018
port: 8080
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -712,10 +714,10 @@
class: low-traffic
sites:
- eqiad
- ip: *graphoid
+ ip: *ip_block019
port: 19000
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -737,10 +739,10 @@
class: low-traffic
sites:
- eqiad
- ip: *restbase
+ ip: *ip_block020
port: 7231
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
ProxyFetch:
url:
@@ -761,10 +763,10 @@
class: low-traffic
sites:
- eqiad
- ip: *zotero
+ ip: *ip_block021
port: 1969
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -782,10 +784,10 @@
class: low-traffic
sites:
- codfw
- ip: *kartotherian
+ ip: *ip_block022
port: 4000
bgp: 'yes'
- depool-threshold: ".5"
+ depool-threshold: '.5'
monitors:
IdleConnection:
timeout-clean-reconnect: 3
@@ -793,3 +795,24 @@
conftool:
cluster: maps
service: kartotherian
+ mobileapps:
+ description: A service for use by mobile apps. Provides DOM manipulation,
aggregation, JSON flattening
+ class: low-traffic
+ sites:
+ - eqiad
+ ip: *ip_block023
+ port: 8888
+ bgp: 'yes'
+ depool-threshold: '.5'
+ monitors:
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: scb
+ service: mobileapps
+ icinga:
+ check_command:
check_http_lvs_on_port!mobileapps.svc.eqiad.wmnet!8888!/_info
+ sites:
+ eqiad:
+ hostname: mobileapps.svc.eqiad.wmnet
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index db74ce1..14af908 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -15,6 +15,7 @@
- 10.2.2.18
- 10.2.2.19
- 10.2.2.20
+- 10.2.2.14
service::configuration::http_proxy: http://url-downloader.wikimedia.org:8080
service::configuration::statsd_host: statsd.eqiad.wmnet
service::configuration::logstash_host: logstash1001.eqiad.wmnet
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 23dfb7b..3fe30e4 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -38,6 +38,7 @@
$sip['restbase'][$::site],
$sip['zotero'][$::site],
$sip['graphoid'][$::site],
+ $sip['mobileapps'][$::site],
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
--
To view, visit https://gerrit.wikimedia.org/r/230790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeaec06afac30fe5a17110e1958eb41f8af32187
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
