Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375801 )
Change subject: jobrunner: add LVS service configuration
......................................................................
jobrunner: add LVS service configuration
Bug: T174599
Change-Id: I65d0372a7ca3bb2e5e613cfc94feab9602030267
---
M hieradata/common/lvs/configuration.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/role/manifests/mediawiki/jobrunner.pp
3 files changed, 34 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 9aba416..d367f9f 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -132,6 +132,9 @@
"recommendation-api": &ip_block038
eqiad: 10.2.2.37
codfw: 10.2.1.37
+ jobrunner: &ip_block039
+ eqiad: 10.2.2.26
+ codfw: 10.2.1.26
lvs::configuration::lvs_services:
text:
@@ -1332,3 +1335,30 @@
hostname: recommendation-api.svc.eqiad.wmnet
codfw:
hostname: recommendation-api.svc.codfw.wmnet
+ jobrunner:
+ description: "JobRunner LVS interface (https)"
+ class: low-traffic
+ sites:
+ - eqiad
+ - codfw
+ ip: *ip_block039
+ port: 443
+ # It's ok to lose most of the service capacity in this case
+ depool-threshold: '.2'
+ monitors:
+ ProxyFetch:
+ url:
+ - https://jobrunner.discovery.wmnet/w/health-check.php
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: jobrunner
+ service: nginx
+ icinga:
+ check_command: "check_https_url!/w/health-check.php"
+ sites:
+ eqiad:
+ hostname: jobrunner.svc.eqiad.wmnet
+ codfw:
+ hostname: jobrunner.svc.codfw.wmnet
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml
b/hieradata/role/common/mediawiki/jobrunner.yaml
index 848a024..5e13e9c 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -17,6 +17,9 @@
size: 30
"namedPools.cirrus-eqiad":
size: 30
+role::lvs::realserver::pools:
+ hhvm:
+ lvs_name: jobrunner
# Use the future parser here
profile::base::environment: "future"
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp
b/modules/role/manifests/mediawiki/jobrunner.pp
index af7b793..81abbcc 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -12,6 +12,7 @@
# TODO: change role used in beta
if hiera('has_lvs', true) {
+ include ::role::lvs::realserver
include ::profile::mediawiki::jobrunner_tls
}
--
To view, visit https://gerrit.wikimedia.org/r/375801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65d0372a7ca3bb2e5e613cfc94feab9602030267
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
