From d88bae6fdf4d65f0d0da806f5d82b11b7c42e2c4 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Mon, 28 May 2018 15:04:38 -0700
Subject: [PATCH] Use httpd::vhost $content parameter

Use the new $content parameter of httpd::vhost instead of $template.
This way, the template gets rendered within the scope where it assumes
its variables are, and doesn't need to use the scope object which
doesn't work within a defined type. This will ensure the template keeps
working on puppet 4.

Depends-On: https://review.openstack.org/570824
Change-Id: I8458c930e48c4c0b60e9b4cadd528a2dc899bb7d
---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 80c1180..5029dcd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -95,7 +95,7 @@ define cgit::site(
     serveraliases => $serveraliases,
     docroot       => 'MEANINGLESS ARGUMENT',
     priority      => $cgit_vhost_priority,
-    template      => 'cgit/git.vhost.erb',
+    content       => template('cgit/git.vhost.erb'),
     ssl           => true,
     require       => [
       File[$staticfiles],