openstack/charm-glance
Code Issues Proposed changes

Use new ha ssl port configuration (HAproxy in front of Apache)

Browse Source
This commit is contained in:
Ante Karamatic 2014-02-16 21:42:14 +01:00
parent ce86120823
commit a6d984e9ad
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/glance_contexts.py
View File

@ -10,8 +10,8 @@ from charmhelpers.contrib.openstack.context import (
) )
from charmhelpers.contrib.hahelpers.cluster import ( from charmhelpers.contrib.hahelpers.cluster import (
determine_apache_port,
determine_api_port, determine_api_port,
determine_haproxy_port,
) )
@ -58,11 +58,12 @@ class HAProxyContext(OSContextGenerator):
specific to this charm. specific to this charm.
Also used to extend glance-api.conf context with correct bind_port Also used to extend glance-api.conf context with correct bind_port
''' '''
haproxy_port = determine_haproxy_port(9292) haproxy_port = 9292
apache_port = determine_apache_port(9292)
api_port = determine_api_port(9292) api_port = determine_api_port(9292)
ctxt = { ctxt = {
'service_ports': {'glance_api': [haproxy_port, api_port]}, 'service_ports': {'glance_api': [haproxy_port, apache_port]},
'bind_port': api_port, 'bind_port': api_port,
} }
return ctxt return ctxt

1
hooks/glance_relations.py
View File

@ -225,6 +225,7 @@ def config_changed():
@hooks.hook('cluster-relation-changed') @hooks.hook('cluster-relation-changed')
@restart_on_change(restart_map(), stopstart=True) @restart_on_change(restart_map(), stopstart=True)
def cluster_changed(): def cluster_changed():
configure_https()
CONFIGS.write(GLANCE_API_CONF) CONFIGS.write(GLANCE_API_CONF)
CONFIGS.write(HAPROXY_CONF) CONFIGS.write(HAPROXY_CONF)

2
revision
View File

@ -1 +1 @@
147 148