From c53349587b7e96cc3fd92d859673af43609d3729 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 24 Nov 2013 14:53:56 -0500 Subject: [PATCH] Use scope::lookupvar for explicit search 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 --- modules/gerrit/templates/gerrit.config.erb | 4 ++-- modules/openstack_project/manifests/review_dev.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index 69e2cf927c..a4d6efd650 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -104,8 +104,8 @@ <% else -%> type = cgit <% end -%> -<% if web_repo_url -%> - url = "<%= web_repo_url %>" +<% if scope.lookupvar("gerrit::web_repo_url") -%> + url = "<%= scope.lookupvar('gerrit::web_repo_url') %>" <% end -%> <% end -%> <% if contactstore == true -%> diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index fa47cd0d52..c19ba8af59 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -66,7 +66,7 @@ class openstack_project::review_dev ( sysadmins => $sysadmins, gitweb => false, cgit => true, - web_repo_url => 'https://git.openstack.org/cgit', + web_repo_url => 'https://git.openstack.org/cgit/', swift_username => $swift_username, swift_password => $swift_password, replication => [