From b7ff8d9c8ca12d8d229b42c7a2dbd6f263212473 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 10 Sep 2018 09:28:16 -0700
Subject: [PATCH] Allow project website volume path to be overridden

We've created a /afs/.openstack.org/project/starlingx.io volume for
starlingx to host specs and docs and whatever else. Currently they are
trying to set up docs.starlingx.io as a vhost to serve docs. This Means
the vhost name and volume path differ. Allow for specifying a volume
name that is different than the volume path in this case. The idea here
is to avoid needing to create separate afs volumes for different (but
related) content.

Change-Id: Iea6d38096f2b4c90feab56289003af29fd5c224d
---
 modules/openstack_project/manifests/website.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/manifests/website.pp b/modules/openstack_project/manifests/website.pp
index 0d91ae26a3..f123f5e88f 100644
--- a/modules/openstack_project/manifests/website.pp
+++ b/modules/openstack_project/manifests/website.pp
@@ -14,6 +14,7 @@
 
 define openstack_project::website (
   $aliases = undef,
+  $volume_name = undef,
   $ssl_cert = undef,
   $ssl_key = undef,
   $ssl_intermediate = undef,
@@ -21,11 +22,17 @@ define openstack_project::website (
 ) {
 
   $afs_root = '/afs/openstack.org/'
+  if $volume_name == undef {
+    # Default to volume name matching vhost name
+    $volume_name_ = $name
+  } else {
+    $volume_name_ = $volume_name
+  }
 
   ::httpd::vhost { $name:
     serveraliases => $aliases,
     port          => 443, # Is required despite not being used.
-    docroot       => "${afs_root}/project/${name}/www",
+    docroot       => "${afs_root}/project/${volume_name_}/www",
     priority      => '50',
     template      => $template,
     require       => [File["/etc/ssl/certs/${name}.pem"],