openstack/charm-glance
Code Issues Proposed changes

Add support for apache2.4 on saucy

Browse Source
This commit is contained in:
James Page 2013-09-25 17:07:28 +01:00
parent 27e6e8bb45
commit 3eef56c607
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hooks/glance_utils.py
View File

@ -51,6 +51,7 @@ GLANCE_API_PASTE_INI = "/etc/glance/glance-api-paste.ini"
CEPH_CONF = "/etc/ceph/ceph.conf"
HAPROXY_CONF = "/etc/haproxy/haproxy.cfg"
HTTPS_APACHE_CONF = "/etc/apache2/sites-available/openstack_https_frontend"
HTTPS_APACHE_24_CONF = "/etc/apache2/sites-available/openstack_https_frontend.conf"
CONF_DIR = "/etc/glance"
@ -90,6 +91,10 @@ CONFIG_FILES = OrderedDict([
(HTTPS_APACHE_CONF, {
'hook_contexts': [glance_contexts.ApacheSSLContext()],
'services': ['apache2'],
}),
(HTTPS_APACHE_24_CONF, {
'hook_contexts': [glance_contexts.ApacheSSLContext()],
'services': ['apache2'],
})
])
@ -106,8 +111,7 @@ def register_configs():
GLANCE_API_CONF,
GLANCE_API_PASTE_INI,
GLANCE_REGISTRY_PASTE_INI,
HAPROXY_CONF,
HTTPS_APACHE_CONF, ]
HAPROXY_CONF]
if relation_ids('ceph'):
if not os.path.isdir('/etc/ceph'):
@ -117,6 +121,13 @@ def register_configs():
for conf in confs:
configs.register(conf, CONFIG_FILES[conf]['hook_contexts'])
if os.path.exists('/etc/apache2/conf-available'):
configs.register(HTTPS_APACHE_24_CONF,
CONFIG_FILES[HTTPS_APACHE_24_CONF]['hook_contexts'])
else:
configs.register(HTTPS_APACHE_CONF,
CONFIG_FILES[HTTPS_APACHE_CONF]['hook_contexts'])
return configs