From 1e57413d262731a1fb7e898e88e3e9348148dbae Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 18 Mar 2013 15:02:09 +0000 Subject: [PATCH] Fixup haproxy port configuration --- hooks/keystone_hooks.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/hooks/keystone_hooks.py b/hooks/keystone_hooks.py index d944fd02..50b18f1f 100755 --- a/hooks/keystone_hooks.py +++ b/hooks/keystone_hooks.py @@ -408,10 +408,14 @@ def cluster_joined(): admin_port=cluster.determine_api_port(config["admin-port"])) utils.restart('keystone') service_ports = { - "keystone_admin": \ + "keystone_admin": [ cluster.determine_haproxy_port(config['admin-port']), - "keystone_service": \ - cluster.determine_haproxy_port(config['service-port']) + cluster.determine_api_port(config["admin-port"]) + ], + "keystone_service": [ + cluster.determine_haproxy_port(config['service-port']), + cluster.determine_api_port(config["service-port"]) + ] } haproxy.configure_haproxy(service_ports) @@ -423,10 +427,14 @@ def cluster_changed(): ensure_user=True) synchronize_service_credentials() service_ports = { - "keystone_admin": \ + "keystone_admin": [ cluster.determine_haproxy_port(config['admin-port']), - "keystone_service": \ - cluster.determine_haproxy_port(config['service-port']) + cluster.determine_api_port(config["admin-port"]) + ], + "keystone_service": [ + cluster.determine_haproxy_port(config['service-port']), + cluster.determine_api_port(config["service-port"]) + ] } haproxy.configure_haproxy(service_ports)