openstack/charm-glance
Code Issues Proposed changes

[gnuoy, r=jamespage] Enable haproxy for when there is a single unit in a deployment

Browse Source
This commit is contained in:
Liam Young 2015-01-08 10:02:48 +00:00
commit 88404a7aa3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/glance_contexts.py
View File

@ -75,8 +75,8 @@ class HAProxyContext(OSContextGenerator):
Also used to extend glance-api.conf context with correct bind_port
'''
haproxy_port = 9292
apache_port = determine_apache_port(9292)
api_port = determine_api_port(9292)
apache_port = determine_apache_port(9292, singlenode_mode=True)
api_port = determine_api_port(9292, singlenode_mode=True)
ctxt = {
'service_ports': {'glance_api': [haproxy_port, apache_port]},

2
hooks/glance_utils.py
View File

@ -117,7 +117,7 @@ CONFIG_FILES = OrderedDict([
'services': ['glance-api', 'glance-registry']
}),
(HAPROXY_CONF, {
'hook_contexts': [context.HAProxyContext(),
'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
glance_contexts.HAProxyContext()],
'services': ['haproxy'],
}),