[MediaWiki-commits] [Gerrit] operations/puppet[production]: Parsoid: Define the mwapi_server and mwapi_proxy config vari...

2016-12-20 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328355 )

Change subject: Parsoid: Define the mwapi_server and mwapi_proxy config 
variables
..


Parsoid: Define the mwapi_server and mwapi_proxy config variables

We want Parsoid to be talking to the appservers in eqiad. However, for
the codfw->eqiad connection, we are using TLS, for which mwapi_server is
used. In eqiad no TLS set up is needed, so use a simple proxy, i.e.
mwapi_proxy.

Change-Id: Ifeff3620efac7f9a0db4136bc42b6171a8917dd3
---
M hieradata/role/codfw/parsoid.yaml
M hieradata/role/eqiad/parsoid.yaml
M modules/parsoid/manifests/init.pp
3 files changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/codfw/parsoid.yaml 
b/hieradata/role/codfw/parsoid.yaml
index a10dfcb..9cc27b2 100644
--- a/hieradata/role/codfw/parsoid.yaml
+++ b/hieradata/role/codfw/parsoid.yaml
@@ -1,3 +1,5 @@
+parsoid::mwapi_server: https://api.svc.eqiad.wmnet
+parsoid::mwapi_proxy: ''
 debdeploy::grains:
   debdeploy-parsoid-codfw:
 value: standard
diff --git a/hieradata/role/eqiad/parsoid.yaml 
b/hieradata/role/eqiad/parsoid.yaml
index 504300a..2a596a4 100644
--- a/hieradata/role/eqiad/parsoid.yaml
+++ b/hieradata/role/eqiad/parsoid.yaml
@@ -1,3 +1,5 @@
+parsoid::mwapi_server: ''
+parsoid::mwapi_proxy: http://api.svc.eqiad.wmnet
 debdeploy::grains:
   debdeploy-parsoid-eqiad:
 value: standard
diff --git a/modules/parsoid/manifests/init.pp 
b/modules/parsoid/manifests/init.pp
index 3ffee3d..5207483 100644
--- a/modules/parsoid/manifests/init.pp
+++ b/modules/parsoid/manifests/init.pp
@@ -23,12 +23,22 @@
 #   Deployment system to use: available are trebuchet, scap3 or git.
 #   Default: scap3
 #
+# [*mwapi_server*]
+#   The MW API server to contact when issuing direct requests to it. Default: 
''
+#
+# [*mwapi_proxy*]
+#   The proxy to use to contact the MW API. Note that you usually want to set
+#   either mwapi_server or this variable. Do not set both! Default:
+#   'http://api.svc.eqiad.wmnet'
+#
 class parsoid(
 $port  = 8000,
 $settings_file = 'conf/wmf/localsettings.js',
 $logging_name  = 'parsoid',
 $statsd_prefix = 'parsoid',
 $deployment= 'scap3',
+$mwapi_server  = '',
+$mwapi_proxy   = 'http://api.svc.eqiad.wmnet',
 ) {
 
 service::node { 'parsoid':
@@ -49,6 +59,10 @@
 auto_refresh  => false,
 deployment=> $deployment,
 deployment_config => true,
+deployment_vars   => {
+mwapi_server => $mwapi_server,
+mwapi_proxy  => $mwapi_proxy,
+},
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeff3620efac7f9a0db4136bc42b6171a8917dd3
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
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]: Parsoid: Define the mwapi_server and mwapi_proxy config vari...

2016-12-20 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328355 )

Change subject: Parsoid: Define the mwapi_server and mwapi_proxy config 
variables
..

Parsoid: Define the mwapi_server and mwapi_proxy config variables

We want Parsoid to be talking to the appservers in eqiad. However, for
the codfw->eqiad connection, we are using TLS, for which mwapi_server is
used. In eqiad no TLS set up is needed, so use a simple proxy, i.e.
mwapi_proxy.

Change-Id: Ifeff3620efac7f9a0db4136bc42b6171a8917dd3
---
M hieradata/role/codfw/parsoid.yaml
M hieradata/role/eqiad/parsoid.yaml
M modules/parsoid/manifests/init.pp
3 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/328355/1

diff --git a/hieradata/role/codfw/parsoid.yaml 
b/hieradata/role/codfw/parsoid.yaml
index a10dfcb..aa61bca 100644
--- a/hieradata/role/codfw/parsoid.yaml
+++ b/hieradata/role/codfw/parsoid.yaml
@@ -1,3 +1,5 @@
+parsoid::mwapi_server: https://api.svc.eqiad.wmnet
+parsoid::mwapi_proxy:
 debdeploy::grains:
   debdeploy-parsoid-codfw:
 value: standard
diff --git a/hieradata/role/eqiad/parsoid.yaml 
b/hieradata/role/eqiad/parsoid.yaml
index 504300a..81dbf0a 100644
--- a/hieradata/role/eqiad/parsoid.yaml
+++ b/hieradata/role/eqiad/parsoid.yaml
@@ -1,3 +1,5 @@
+parsoid::mwapi_server:
+parsoid::mwapi_proxy: http://api.svc.eqiad.wmnet
 debdeploy::grains:
   debdeploy-parsoid-eqiad:
 value: standard
diff --git a/modules/parsoid/manifests/init.pp 
b/modules/parsoid/manifests/init.pp
index 3ffee3d..765f39b 100644
--- a/modules/parsoid/manifests/init.pp
+++ b/modules/parsoid/manifests/init.pp
@@ -23,12 +23,22 @@
 #   Deployment system to use: available are trebuchet, scap3 or git.
 #   Default: scap3
 #
+# [*mwapi_server*]
+#   The MW API server to contact when issuing direct requests to it. Default: 
''
+#
+# [*mwapi_proxy*]
+#   The proxy to use to contact the MW API. Note that you usually want to set
+#   either mwapi_server or this variable. Do not set both! Default:
+#   'http://api.svc.eqiad.wmnet'
+#
 class parsoid(
 $port  = 8000,
 $settings_file = 'conf/wmf/localsettings.js',
 $logging_name  = 'parsoid',
 $statsd_prefix = 'parsoid',
 $deployment= 'scap3',
+$mwapi_server  = '',
+$mwapi_proxy   = 'http://api.svc.eqiad.wmnet',
 ) {
 
 service::node { 'parsoid':
@@ -49,6 +59,10 @@
 auto_refresh  => false,
 deployment=> $deployment,
 deployment_config => true,
+deployment_vars   => {
+mwapi_server => $mwapiserver,
+mwapi_proxy  => $mwapiproxy,
+},
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeff3620efac7f9a0db4136bc42b6171a8917dd3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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