Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275536
Change subject: restbase: make restbase configuration $master_dc
......................................................................
restbase: make restbase configuration $master_dc
Bug: T126235
Change-Id: I1eb163154449e155d7a1a5bcfb143537f678ad73
---
M hieradata/role/common/restbase.yaml
M modules/restbase/templates/config.yaml.erb
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/275536/1
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index f54803f..08b969c 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -10,7 +10,7 @@
- "eqiad"
- "codfw"
restbase::statsd_host: statsd.eqiad.wmnet
-restbase::parsoid_uri: http://parsoid.svc.eqiad.wmnet:8000
+restbase::parsoid_uri: http://parsoid.svc.%{::parsoid_primary}.wmnet:8000
restbase::graphoid_uri: http://graphoid.svc.eqiad.wmnet:19000
restbase::mobileapps_uri: http://mobileapps.svc.eqiad.wmnet:8888
restbase::mathoid_uri: http://mathoid.svc.eqiad.wmnet:10042
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index b1d94e8..4d050d2 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -1,5 +1,5 @@
# RESTBase wikimedia config
-
+<% mw_primary = scope.lookupvar('::mw_primary') %>
# First, load & parametrize project templates. These are referenced / shared
# between domains in the root_spec further down.
default_project: &default_project
@@ -45,7 +45,7 @@
parsoid:
host: <%= @parsoid_uri %>
action:
- apiUriTemplate: http://api.svc.eqiad.wmnet/w/api.php
+ apiUriTemplate: http://api.svc.<%= mw_primary %>.wmnet/w/api.php
graphoid:
host: <%= @graphoid_uri %>
mathoid:
--
To view, visit https://gerrit.wikimedia.org/r/275536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb163154449e155d7a1a5bcfb143537f678ad73
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
