Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/325160
Change subject: service::node: Set a default for ::restbase::port ...................................................................... service::node: Set a default for ::restbase::port The service::node configuration file needs RESTBase's port, which isn't always available. We cannot make service::node require RESTBase, because that would create a circular dependency for services that RESTBase requires itself (most notably Parsoid). As a work-around, check if $::restbase::port is available, and if it isn't use the hard-coded default of 7231. Bug: T152183 Change-Id: I407972136b12abe0aceed77b7d1014c1d33b617e --- M puppet/modules/service/manifests/node.pp M puppet/modules/service/templates/node/config.yaml.erb 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/60/325160/1 diff --git a/puppet/modules/service/manifests/node.pp b/puppet/modules/service/manifests/node.pp index 415c25c..ee4f814 100644 --- a/puppet/modules/service/manifests/node.pp +++ b/puppet/modules/service/manifests/node.pp @@ -95,6 +95,11 @@ undef => $::service::log_level, default => $log_level } + # ensure the RB port is defined for the config + $restbase_port = $::restbase::port ? { + undef => 7231, + default => $::restbase::port + } # the repo git::clone { $title: diff --git a/puppet/modules/service/templates/node/config.yaml.erb b/puppet/modules/service/templates/node/config.yaml.erb index f23792c..4326388 100644 --- a/puppet/modules/service/templates/node/config.yaml.erb +++ b/puppet/modules/service/templates/node/config.yaml.erb @@ -55,7 +55,7 @@ # the template used for contacting RESTBase restbase_req: method: '{{request.method}}' - uri: http://localhost:<%= scope.lookupvar('restbase::port') %>/{{domain}}/v1/{+path} + uri: http://localhost:<%= @restbase_port %>/{{domain}}/v1/{+path} query: '{{ default(request.query, {}) }}' headers: '{{request.headers}}' body: '{{request.body}}' -- To view, visit https://gerrit.wikimedia.org/r/325160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I407972136b12abe0aceed77b7d1014c1d33b617e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits