From aced810ba7a2c77802946a7fc6d6690d37f8f67b Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@enovance.com>
Date: Tue, 31 Dec 2013 16:54:12 +0100
Subject: [PATCH] dashboard: temporary fix for horizon bug

Upstream patch: https://review.openstack.org/#/c/64523/
Closes: #4493
---
 files/apache/openstack-dashboard.conf | 35 +++++++++++++++++++++++++++
 manifests/dashboard.pp                | 12 ++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 files/apache/openstack-dashboard.conf

diff --git a/files/apache/openstack-dashboard.conf b/files/apache/openstack-dashboard.conf
new file mode 100644
index 00000000..895c565b
--- /dev/null
+++ b/files/apache/openstack-dashboard.conf
@@ -0,0 +1,35 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
+    WSGIDaemonProcess horizon user=www-data group=www-data
+    #WSGIProcessGroup openstack-dashboard
+    Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
+
+    DocumentRoot /var/www
+
+    <Directory />
+    	AllowOverride None
+    </Directory>
+
+    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
+    	Order allow,deny
+    	Allow from all
+    </Directory>
+
+    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
+
+    <Directory /usr/share/pyshared/horizon/static/horizon>
+    	Order allow,deny
+    	Allow from all
+    </Directory>
+
+    #Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
+
+    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
+    	Order allow,deny
+    	Allow from all
+    </Directory>
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    LogLevel warn
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+ </VirtualHost>
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index affc900e..d3205853 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -50,6 +50,13 @@ class privatecloud::dashboard(
   $listen_ssl                = false,
 ) {
 
+  #FIXME https://review.openstack.org/#/c/64523/
+  file {
+    '/etc/apache2/conf.d/openstack-dashboard.conf':
+      ensure  => file,
+      source  => 'puppet:///modules/privatecloud/apache/openstack-dashboard.conf';
+  }
+
   class {'horizon':
     secret_key          => $secret_key,
     keystone_host       => $ks_keystone_internal_host,
@@ -57,7 +64,9 @@ class privatecloud::dashboard(
     # fqdn can can be ambiguous since we use reverse DNS here,
     # e.g: 127.0.0.1 instead of a public IP address.
     # We force $local_ip to avoid this situation
-    fqdn                => $local_ip
+    #FIXME https://review.openstack.org/#/c/64523/
+    fqdn                => $local_ip,
+    require             => File['/etc/apache2/conf.d/openstack-dashboard.conf'];
   }
 
   @@haproxy::balancermember{"${::fqdn}-horizon":
@@ -68,4 +77,5 @@ class privatecloud::dashboard(
     options           => 'check inter 2000 rise 2 fall 5'
   }
 
+
 }