opendev/system-config
Code Issues Proposed changes

Use scope::lookupvar for explicit search

Browse Source 
Scoping rules mean that we need to be explicit here or else puppet finds
the wrong thing. Also, puppet needs a trailing slash.

Change-Id: Ifc2f03dbf1dd746515e00ded5d76fe7393ce6c7e
This commit is contained in:
Monty Taylor 2013-11-24 14:53:56 -05:00
parent b5c69b56f3
commit c53349587b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gerrit/templates/gerrit.config.erb
View File

@ -104,8 +104,8 @@
<% else -%> <% else -%>
type = cgit type = cgit
<% end -%> <% end -%>
<% if web_repo_url -%> <% if scope.lookupvar("gerrit::web_repo_url") -%>
url = "<%= web_repo_url %>" url = "<%= scope.lookupvar('gerrit::web_repo_url') %>"
<% end -%> <% end -%>
<% end -%> <% end -%>
<% if contactstore == true -%> <% if contactstore == true -%>

2
modules/openstack_project/manifests/review_dev.pp
View File

@ -66,7 +66,7 @@ class openstack_project::review_dev (
sysadmins => $sysadmins, sysadmins => $sysadmins,
gitweb => false, gitweb => false,
cgit => true, cgit => true,
web_repo_url => 'https://git.openstack.org/cgit', web_repo_url => 'https://git.openstack.org/cgit/',
swift_username => $swift_username, swift_username => $swift_username,
swift_password => $swift_password, swift_password => $swift_password,
replication => [ replication => [