[MediaWiki-commits] [Gerrit] operations/puppet[production]: wdqs - configure varnish to use LVS service as backend

2016-10-12 Thread BBlack (Code Review) 
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 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wdqs - configure varnish to use LVS service as backend

2016-09-22 Thread Gehel (Code Review) 
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 

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