Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: cxserver: use $rb_primary in configuring restbase urls
......................................................................

cxserver: use $rb_primary in configuring restbase urls

Bug: T125065
Change-Id: Ie12de964ae85747f4281fc6250660df70e343e4e
---
M hieradata/common/cxserver.yaml
M modules/cxserver/manifests/init.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/275537/1

diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml
index fad2b1d..36f91be 100644
--- a/hieradata/common/cxserver.yaml
+++ b/hieradata/common/cxserver.yaml
@@ -1,6 +1,6 @@
 yandex_url: https://translate.yandex.net
 no_proxy_list:
-  - restbase.svc.eqiad.wmnet
+  - restbase.svc.%{::rb_primary}.wmnet
   - apertium.svc.eqiad.wmnet
 registry:
   source:
diff --git a/modules/cxserver/manifests/init.pp 
b/modules/cxserver/manifests/init.pp
index db35c4b..e4e81f3 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -18,7 +18,7 @@
 # [*jwt_secret*]
 #   JWT secret token.
 class cxserver(
-    $restbase_url = 
'http://restbase.svc.eqiad.wmnet:7231/@lang.wikipedia.org/v1/page/html/@title',
+    $restbase_url = 
"http://restbase.svc.${::rb_primary}.wmnet:7231/@lang.wikipedia.org/v1/page/html/@title";,
     $apertium = 'http://apertium.svc.eqiad.wmnet:2737',
     $yandex_url = undef,
     $yandex_api_key = undef,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie12de964ae85747f4281fc6250660df70e343e4e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to