Gehel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312225

Change subject: wdqs - configure varnish to use LVS service as backend
......................................................................

wdqs - configure varnish to use LVS service as backend

Bug: T132457
Change-Id: I4720aa220fc5e43cdd890d6d6614886a1a9d430d
---
M hieradata/common/cache/misc.yaml
M modules/role/manifests/cache/misc.pp
2 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/312225/1

diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index 15a8a47..1dcabcc 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -19,3 +19,9 @@
     - 'cp4002.ulsfo.wmnet'
     - 'cp4003.ulsfo.wmnet'
     - 'cp4004.ulsfo.wmnet'
+apps:
+  wdqs:
+    route: 'eqiad'
+    backends:
+      eqiad: 'wdqs.svc.eqiad.wmnet'
+      codfw: 'wdqs.svc.codfw.wmnet'
diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 367c2af..59de220 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -42,6 +42,7 @@
     # To use it, set the following flag in the target director:
     # 'maintenance' => 'Error message to display to the user.'
     #
+    $apps = hiera('cache::misc::apps')
     $app_directors = {
         'analytics1027' => { # Hue (Hadoop GUI)
             'dynamic'  => 'no',
@@ -267,10 +268,7 @@
         'wdqs_director' => {
             'dynamic'  => 'no',
             'type'     => 'random',
-            'backends' => [
-                'wdqs1001.eqiad.wmnet',
-                'wdqs1002.eqiad.wmnet',
-            ],
+            'backends' =>$apps['wdqs']['backends'][$apps['wdqs']['route']],
             'be_opts'  => merge($app_def_be_opts, { 'probe' => 'wdqs' }),
             'req_host' => 'query.wikidata.org',
         },

-- 
To view, visit https://gerrit.wikimedia.org/r/312225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4720aa220fc5e43cdd890d6d6614886a1a9d430d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to