openstack/charm-keystone
Code Issues Proposed changes

Fixup haproxy port configuration

Browse Source
This commit is contained in:
James Page 2013-03-18 15:02:09 +00:00
parent 34febb4ef0
commit 1e57413d26
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hooks/keystone_hooks.py
View File

@ -408,10 +408,14 @@ def cluster_joined():
admin_port=cluster.determine_api_port(config["admin-port"])) admin_port=cluster.determine_api_port(config["admin-port"]))
utils.restart('keystone') utils.restart('keystone')
service_ports = { service_ports = {
"keystone_admin": \ "keystone_admin": [
cluster.determine_haproxy_port(config['admin-port']), cluster.determine_haproxy_port(config['admin-port']),
"keystone_service": \ cluster.determine_api_port(config["admin-port"])
cluster.determine_haproxy_port(config['service-port']) ],
"keystone_service": [
cluster.determine_haproxy_port(config['service-port']),
cluster.determine_api_port(config["service-port"])
]
} }
haproxy.configure_haproxy(service_ports) haproxy.configure_haproxy(service_ports)
@ -423,10 +427,14 @@ def cluster_changed():
ensure_user=True) ensure_user=True)
synchronize_service_credentials() synchronize_service_credentials()
service_ports = { service_ports = {
"keystone_admin": \ "keystone_admin": [
cluster.determine_haproxy_port(config['admin-port']), cluster.determine_haproxy_port(config['admin-port']),
"keystone_service": \ cluster.determine_api_port(config["admin-port"])
cluster.determine_haproxy_port(config['service-port']) ],
"keystone_service": [
cluster.determine_haproxy_port(config['service-port']),
cluster.determine_api_port(config["service-port"])
]
} }
haproxy.configure_haproxy(service_ports) haproxy.configure_haproxy(service_ports)