Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Setup LVS for kartotherian service on maps cluster
......................................................................
Setup LVS for kartotherian service on maps cluster
For this to work, also include lvs::realserver on maps cluster
Change-Id: I52381dc15eb63322960511593da1d0f08e8ce119
---
M hieradata/common/lvs/configuration.yaml
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
M manifests/role/maps.pp
M modules/role/manifests/lvs/balancer.pp
5 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 91c3677..e0e95d6 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -118,6 +118,8 @@
eqiad: 10.2.2.17
zotero: &zotero
eqiad: 10.2.2.16
+ kartotherian: &kartotherian
+ codfw: 10.2.1.13
lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -825,3 +827,16 @@
sites:
eqiad:
hostname: zotero.svc.eqiad.wmnet
+ kartotherian:
+ description: Kartotherian, kartotherian.svc.codfw.wmnet
+ class: low-traffic
+ sites:
+ - codfw
+ ip: *kartotherian
+ port: 4000
+ bgp: 'yes'
+ depool-threshold: ".5"
+ monitors:
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
diff --git a/hieradata/role/codfw/maps/master.yaml
b/hieradata/role/codfw/maps/master.yaml
index c2b196d..cd0b69a 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -31,3 +31,5 @@
- kartotherian-admin
service::configuration::logstash_host: logstash1001.eqiad.wmnet
service::configuration::statsd_host: statsd.eqiad.wmnet
+lvs::realserver::realserver_ips:
+ - 10.2.1.13
diff --git a/hieradata/role/codfw/maps/slave.yaml
b/hieradata/role/codfw/maps/slave.yaml
index 95b2728..569a823 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -17,3 +17,5 @@
- kartotherian-admin
service::configuration::logstash_host: logstash1001.eqiad.wmnet
service::configuration::statsd_host: statsd.eqiad.wmnet
+lvs::realserver::realserver_ips:
+ - 10.2.1.13
diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 7560972..c3985fe 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -5,6 +5,9 @@
include ::osm
include ::cassandra
include ::role::kartotherian
+ if $::realm == 'production' {
+ include lvs::realserver
+ }
postgresql::spatialdb { 'gis':
require => Class['::postgresql::postgis'],
@@ -38,6 +41,9 @@
include ::postgresql::postgis
include ::cassandra
include ::role::kartotherian
+ if $::realm == 'production' {
+ include lvs::realserver
+ }
system::role { 'role::maps::slave':
ensure => 'present',
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 493b187..00a2029 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -56,6 +56,7 @@
$sip['api'][$::site],
$sip['rendering'][$::site],
$sip['swift'][$::site],
+ $sip['kartotherian'][$::site],
],
# esams + ulsfo
--
To view, visit https://gerrit.wikimedia.org/r/225703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52381dc15eb63322960511593da1d0f08e8ce119
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
