openstack
/
charm-heat
Code Issues Proposed changes

cleanup

This commit is contained in:
Edward Hope-Morley 2015-04-01 14:00:37 +01:00
parent 89ca3af44b
commit f384b435e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/heat_utils.py
View File

@ -71,11 +71,11 @@ CONFIG_FILES = OrderedDict([
'contexts': [HeatIdentityServiceContext()],
}),
(HTTPS_APACHE_CONF, {
'hook_contexts': [HeatApacheSSLContext()],
'contexts': [HeatApacheSSLContext()],
'services': ['apache2'],
}),
(HTTPS_APACHE_24_CONF, {
'hook_contexts': [HeatApacheSSLContext()],
'contexts': [HeatApacheSSLContext()],
'services': ['apache2'],
})
])
@ -92,10 +92,10 @@ def register_configs():
if os.path.exists('/etc/apache2/conf-available'):
configs.register(HTTPS_APACHE_24_CONF,
CONFIG_FILES[HTTPS_APACHE_24_CONF]['hook_contexts'])
CONFIG_FILES[HTTPS_APACHE_24_CONF]['contexts'])
else:
configs.register(HTTPS_APACHE_CONF,
CONFIG_FILES[HTTPS_APACHE_CONF]['hook_contexts'])
CONFIG_FILES[HTTPS_APACHE_CONF]['contexts'])
return configs