Point openstack apache config file at python virtualenv

This commit is contained in:
Corey Bryant 2015-05-08 12:19:44 +00:00
parent 163841485c
commit fef67d7ef3
2 changed files with 9 additions and 5 deletions

View File

@ -37,7 +37,9 @@ from charmhelpers.core.host import (
mkdir,
service_restart,
)
from charmhelpers.core.templating import (
render,
)
from charmhelpers.fetch import (
apt_upgrade,
apt_update,
@ -320,10 +322,6 @@ def git_post_install(projects_yaml):
'local_settings.py.example'),
'dest': '/etc/openstack-dashboard/local_settings.py',
},
'openstack-dashboard': {
'src': os.path.join(templates_dir, 'dashboard.conf'),
'dest': '/etc/apache2/conf-available/openstack-dashboard.conf',
},
}
for name, files in copy_files.iteritems():
@ -361,6 +359,11 @@ def git_post_install(projects_yaml):
os.remove(s['link'])
os.symlink(s['src'], s['link'])
render('git/dashboard.conf',
'/etc/apache2/conf-available/openstack-dashboard.conf',
{'virtualenv': git_pip_venv_dir(projects_yaml)},
owner='root', group='root', perms=0o644)
os.chmod('/var/lib/openstack-dashboard', 0o750)
os.chmod('/usr/share/openstack-dashboard/manage.py', 0o755),

View File

@ -1,6 +1,7 @@
WSGIScriptAlias /horizon /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10
WSGIProcessGroup horizon
WSGIPythonHome {{ virtualenv }}
Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
Order allow,deny