From cdb05c20e45929ab453bc62a6fe4bb91d76038bb Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Fri, 20 Apr 2018 21:52:41 +0200 Subject: [PATCH] Use instance variables in puppet template Using local ruby variables in puppet ERB templates was deprecated in puppet 3 and doesn't work any more in puppet 4. Access these values as ruby instance variables instead. Change-Id: I12f294d353066ff4af211b9823398a5084a585ee --- .../templates/review-dev.projects.ini.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/templates/review-dev.projects.ini.erb b/modules/openstack_project/templates/review-dev.projects.ini.erb index 6a65e94774..06467fd189 100644 --- a/modules/openstack_project/templates/review-dev.projects.ini.erb +++ b/modules/openstack_project/templates/review-dev.projects.ini.erb @@ -1,11 +1,11 @@ [projects] homepage=http://openstack.org acl-dir=/home/gerrit2/acls -local-git-dir=<%= local_git_dir %> -jeepyb-cache-dir=<%= jeepyb_cache_dir %> -gerrit-host=<%= fqdn %> +local-git-dir=<%= @local_git_dir %> +jeepyb-cache-dir=<%= @jeepyb_cache_dir %> +gerrit-host=<%= @fqdn %> gerrit-user=openstack-dev-project-creator -gerrit-key=<%= ssh_project_key %> +gerrit-key=<%= @ssh_project_key %> github-config=/etc/github/github-projects.secure.config has-wiki=False has-issues=False