From a9a84e8282cb81de878fa18c62ddca38611a6261 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 9 Mar 2012 15:44:35 -0800 Subject: [PATCH] Missed using defaults on keystone shared params from config --- devstack/components/keystone.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devstack/components/keystone.py b/devstack/components/keystone.py index 5f01720b..2ecee0fe 100644 --- a/devstack/components/keystone.py +++ b/devstack/components/keystone.py @@ -270,17 +270,17 @@ def get_shared_params(config, service_user_name=None): #components of the auth endpoint keystone_auth_host = config.getdefaulted('keystone', 'keystone_auth_host', host_ip) mp['KEYSTONE_AUTH_HOST'] = keystone_auth_host - keystone_auth_port = config.get('keystone', 'keystone_auth_port') + keystone_auth_port = config.getdefaulted('keystone', 'keystone_auth_port', '35357') mp['KEYSTONE_AUTH_PORT'] = keystone_auth_port - keystone_auth_proto = config.get('keystone', 'keystone_auth_protocol') + keystone_auth_proto = config.getdefaulted('keystone', 'keystone_auth_protocol', 'http') mp['KEYSTONE_AUTH_PROTOCOL'] = keystone_auth_proto #components of the service endpoint keystone_service_host = config.getdefaulted('keystone', 'keystone_service_host', host_ip) mp['KEYSTONE_SERVICE_HOST'] = keystone_service_host - keystone_service_port = config.get('keystone', 'keystone_service_port') + keystone_service_port = config.getdefaulted('keystone', 'keystone_service_port', '5000') mp['KEYSTONE_SERVICE_PORT'] = keystone_service_port - keystone_service_proto = config.get('keystone', 'keystone_service_protocol') + keystone_service_proto = config.getdefaulted('keystone', 'keystone_service_protocol', 'http') mp['KEYSTONE_SERVICE_PROTOCOL'] = keystone_service_proto #http/https endpoints