[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: service::node: Fix RESTBase port

2018-01-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401400 )

Change subject: service::node: Fix RESTBase port
..


service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index d7d80da..7c95493 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -96,9 +96,9 @@
 default => $log_level
 }
 # ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef   => 7231,
-default => $::restbase::port
+$restbase_port = defined(Class['restbase']) ? {
+true=> $::restbase::port,
+default => 7231,
 }
 
 # the repo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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] mediawiki/vagrant[stretch-migration]: service::node: Fix RESTBase port

2018-01-01 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401400 )

Change subject: service::node: Fix RESTBase port
..

service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
M puppet/modules/service/templates/node/config.yaml.erb
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/401400/1

diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index d7d80da..9aaef8c 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -95,11 +95,6 @@
 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 f46a576..c858429 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:<%= @restbase_port %>/{{domain}}/v1/{+path}
+uri: http://localhost:<%= scope['::restbase::port'] ? 
scope['::restbase::port'] : 7231 %>/{{domain}}/v1/{+path}
 query: '{{ default(request.query, {}) }}'
 headers: '{{request.headers}}'
 body: '{{request.body}}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Mobrovac 

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