From b9dde8d0e317203e349b8e4bca5bc9923c11974e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 1 Dec 2011 22:40:32 -0500 Subject: Make bin/keystone use port settings in the config file. Fixes bug #898935. Change-Id: I40c91a40eb853f7a1566454d005ccf2fcf9c8eb9 --- bin/keystone | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/keystone b/bin/keystone index d15a39b3..db4d1dca 100755 --- a/bin/keystone +++ b/bin/keystone @@ -80,8 +80,7 @@ if __name__ == '__main__': config_file = config.find_config_file(options, args) print "Using config file:", config_file - port = options.get('bind_port', conf.get('service_port', 5000)) - port = int(port or 5000) + port = int(options.get('bind_port') or conf.get('service_port', 5000)) host = options.get('bind_host', conf.get('service_host', '0.0.0.0')) # Load Service API server @@ -99,8 +98,7 @@ if __name__ == '__main__': service_ssl, host, port) # Load Admin API server - port = options.get('admin_port', conf.get('admin_port', 35357)) - port = int(port or 35357) + port = int(options.get('admin_port') or conf.get('admin_port', 35357)) host = options.get('bind_host', conf.get('admin_host', '0.0.0.0')) if admin_ssl: -- cgit