BBlack has submitted this change and it was merged.

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 modules/role/manifests/cache/misc.pp
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
2 files changed, 1 insertion(+), 12 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index e56e77a..3c96a21 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -271,10 +271,7 @@
         'wdqs_director' => {
             'dynamic'  => 'no',
             'type'     => 'random',
-            'backends' => [
-                'wdqs1001.eqiad.wmnet',
-                'wdqs1002.eqiad.wmnet',
-            ],
+            'backends' => [ 'wdqs.svc.eqiad.wmnet', ],
             'be_opts'  => merge($app_def_be_opts, { 'probe' => 'wdqs' }),
             'req_host' => 'query.wikidata.org',
         },
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index e4b1eaa..88a6339 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -99,14 +99,6 @@
        .threshold = 3;
 }
 
-probe wdqs {
-       .url = "/";
-       .interval = 5s;
-       .timeout = 1s;
-       .window = 5;
-       .threshold = 3;
-}
-
 <%
 # Directors / Backends
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4720aa220fc5e43cdd890d6d6614886a1a9d430d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to