From c03b2df2acefe55f007ecbb85e353115c02ef137 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 22 Jan 2018 11:02:39 -0800
Subject: [PATCH] Fix zuul-ci.org website def

We should use {} in templated strings to avoid confusion about
variable names.  Also, make sure the required cert files are in
place before trying to create a vhost.

Change-Id: I24ef5ffe347a4a389acb282ea3a41b87fb34f6bc
---
 modules/openstack_project/manifests/website.pp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/openstack_project/manifests/website.pp b/modules/openstack_project/manifests/website.pp
index 50c1a594a8..0d91ae26a3 100644
--- a/modules/openstack_project/manifests/website.pp
+++ b/modules/openstack_project/manifests/website.pp
@@ -28,9 +28,12 @@ define openstack_project::website (
     docroot       => "${afs_root}/project/${name}/www",
     priority      => '50',
     template      => $template,
+    require       => [File["/etc/ssl/certs/${name}.pem"],
+                      File["/etc/ssl/private/${name}.key"],
+                      File["/etc/ssl/certs/${name}_intermediate.pem"]],
   }
 
-  file { "/etc/ssl/certs/$name.pem":
+  file { "/etc/ssl/certs/${name}.pem":
     ensure  => present,
     owner   => 'root',
     group   => 'root',
@@ -39,7 +42,7 @@ define openstack_project::website (
     require => File['/etc/ssl/certs'],
   }
 
-  file { "/etc/ssl/private/$name.key":
+  file { "/etc/ssl/private/${name}.key":
     ensure  => present,
     owner   => 'root',
     group   => 'root',
@@ -48,7 +51,7 @@ define openstack_project::website (
     require => File['/etc/ssl/private'],
   }
 
-  file { "/etc/ssl/certs/$name_intermediate.pem":
+  file { "/etc/ssl/certs/${name}_intermediate.pem":
     ensure  => present,
     owner   => 'root',
     group   => 'root',