dashboard: temporary fix for horizon bug

Upstream patch: https://review.openstack.org/#/c/64523/
Closes: #4493
This commit is contained in:
Sebastien Badia 2013-12-31 16:54:12 +01:00
parent 0f82c1cfdc
commit aced810ba7
2 changed files with 46 additions and 1 deletions

View File

@ -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>

View File

@ -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'
}
}