From b990dd243b3b178e166d2194e0406368a4c98772 Mon Sep 17 00:00:00 2001 From: Yaguang Tang Date: Sun, 1 Jan 2012 14:51:59 +0800 Subject: fix bug lp:910491 option "service_host" in keystone.conf not works Change-Id: I1a0b78a2ef9dab287e719657c058f4ed2675b2c1 --- AUTHORS | 1 + keystone/common/config.py | 2 +- keystone/server.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index df92020d..f4d3d399 100644 --- a/AUTHORS +++ b/AUTHORS @@ -40,6 +40,7 @@ Thierry Carrez Todd Willey Will Kelly Vishvananda Ishaya +Yaguang Tang Yogeshwar Srikrishnan Yuriy Taraday Ziad Sawalha diff --git a/keystone/common/config.py b/keystone/common/config.py index d81133f0..e34b39ee 100755 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -85,7 +85,7 @@ for a config file.""") dest="bind_port", help="specifies port to listen on") group.add_option('--host', '--bind-host', - default="0.0.0.0", dest="bind_host", + default=None, dest="bind_host", help="specifies host address to listen on "\ "(default is all or 0.0.0.0)") # This one is handled by keystone/tools/tracer.py (if loaded) diff --git a/keystone/server.py b/keystone/server.py index f23fd60e..11c21d4c 100755 --- a/keystone/server.py +++ b/keystone/server.py @@ -160,7 +160,7 @@ class Server(): port = int(self.options.get('bind_port') or conf.get('service_port', 5000)) if host is None: - host = self.options.get('bind_host', + host = (self.options.get('bind_host') or conf.get('service_host', '0.0.0.0')) self.key = "%s-%s:%s" % (self.name, host, port) -- cgit