openstack
/
charm-cinder
Code Issues Proposed changes

Fix disabling cinder wsgi vhost from package 

The package shipped vhost should be disabled by the charm but due to a bug
this was not happening. This means that apache (on artful) fails to start.
On xenial and zesty both seem to allow apache to start when it has a
conflicting port with haproxy which is why this has not caused a problem
previousy releases (Bug #1720378).

Change-Id: Ic83452d232838e6ffcc2b8dc5f33dae347f7cb3d
Closes-Bug: #1720215
Depends-On: I08c3963eb21bbc9f1035a5f565a9b4d993222887
This commit is contained in:
Liam Young 2017-09-29 17:42:27 +00:00 committed by Frode Nordahl
parent 32c14c46c3
commit 6dd1af6059
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/cinder_utils.py
View File

@ -184,7 +184,7 @@ APACHE_SITE_24_CONF = '/etc/apache2/sites-available/' \
'openstack_https_frontend.conf'
MEMCACHED_CONF = '/etc/memcached.conf'
WSGI_CINDER_API_CONF = '/etc/apache2/sites-enabled/wsgi-openstack-api.conf'
PACKAGE_CINDER_API_CONF = '/etc/apache2/sites-enabled/cinder-wsgi.conf'
PACKAGE_CINDER_API_CONF = '/etc/apache2/conf-enabled/cinder-wsgi.conf'
VERSION_PACKAGE = 'cinder-common'
@ -1100,4 +1100,4 @@ def disable_package_apache_site():
prevent it from conflicting with the charm-provided version.
"""
if os.path.exists(PACKAGE_CINDER_API_CONF):
subprocess.check_call(['a2dissite', 'cinder-wsgi'])
subprocess.check_call(['a2disconf', 'cinder-wsgi'])