BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315537
Change subject: rcstream: internal LVS service
......................................................................
rcstream: internal LVS service
Bug: T147845
Change-Id: I11ff5829a913f2ea9b148c700e121b6854532592
---
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M manifests/role/rcstream.pp
4 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/315537/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 01e05a5..7c3dd1e 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -313,3 +313,6 @@
wdqs:
wdqs1001.eqiad.wmnet: [wdqs]
wdqs1002.eqiad.wmnet: [wdqs]
+stream:
+ rcs1001.eqiad.wmnet: [stream]
+ rcs1002.eqiad.wmnet: [stream]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 633aa2e..4b38a7c 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -167,3 +167,11 @@
default_values:
pooled: 'no'
weight: 10
+stream:
+ stream:
+ port: 80
+ datacenters:
+ - eqiad
+ default_values:
+ pooled: 'no'
+ weight: 10
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 20560fa..3377e15 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -129,6 +129,8 @@
wdqs: &ip_block031
eqiad: 10.2.2.32
codfw: 10.2.1.32
+ stream: &ip_block032
+ eqiad: 10.2.2.33
lvs::configuration::lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -1015,3 +1017,28 @@
hostname: wdqs.svc.eqiad.wmnet
codfw:
hostname: wdqs.svc.codfw.wmnet
+ stream:
+ description: rcstream Service
+ class: low-traffic
+ sites:
+ - eqiad
+ ip: *ip_block032
+ port: 80
+ scheduler: sh
+ bgp: 'yes'
+ depool-threshold: '.5'
+ monitors:
+ ProxyFetch:
+ url:
+ - http://localhost/
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: stream
+ service: stream
+ icinga:
+ check_command: check_http_on_port!80
+ sites:
+ eqiad:
+ hostname: stream.svc.eqiad.wmnet
diff --git a/manifests/role/rcstream.pp b/manifests/role/rcstream.pp
index bc3472f..d225c89 100644
--- a/manifests/role/rcstream.pp
+++ b/manifests/role/rcstream.pp
@@ -11,6 +11,10 @@
description => 'MediaWiki Recent Changes stream',
}
+ lvs::realserver { 'rcstream:
+ realserver_ips => $lvs::configuration::service_ips['stream'][$::site]
+ }
+
redis::instance { 6379:
settings => {
maxmemory => '100mb',
--
To view, visit https://gerrit.wikimedia.org/r/315537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11ff5829a913f2ea9b148c700e121b6854532592
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
