From ea66db19f14120d14754d7a647bf9dc3715dab2a Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 16 Jan 2019 19:54:55 +0000
Subject: [PATCH] Correct auth_openid scope in survey vhost

With the move to Puppet 4, vhost config templates fail to find
relative references to class parameters within a vhost resource
scope. Be explicit about the scope for the auth_openid parameter in
the survey class from within its associated vhost config template so
that it will be correctly found.

Change-Id: I7c769849449b304193e3eb41d129364817d7db1f
---
 modules/openstack_project/templates/survey.vhost.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openstack_project/templates/survey.vhost.erb b/modules/openstack_project/templates/survey.vhost.erb
index 036106e0a8..83885588c6 100644
--- a/modules/openstack_project/templates/survey.vhost.erb
+++ b/modules/openstack_project/templates/survey.vhost.erb
@@ -24,7 +24,7 @@
     Require all granted
   </Directory>
 
-  <% if @auth_openid != nil %>
+  <% if scope.lookupvar("openstack_project::survey::auth_openid") != nil %>
     <Location /index.php/admin/>
       AuthType OpenID
       AuthName "Welcome"