diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-04 00:17:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-04 00:17:37 +0000 |
| commit | ddc949588461e8b4570aa0b5fc41d5b316fbc8bd (patch) | |
| tree | a2891b36661c6fb73aa7b1ba29e86c689cdd8a72 | |
| parent | bdf4b831efe1aef89e85db81cf6de76ae0e93752 (diff) | |
| parent | b990dd243b3b178e166d2194e0406368a4c98772 (diff) | |
Merge "fix bug lp:910491 option "service_host" in keystone.conf not works"
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rwxr-xr-x | keystone/common/config.py | 2 | ||||
| -rwxr-xr-x | keystone/server.py | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -40,6 +40,7 @@ Thierry Carrez <thierry@openstack.org> Todd Willey <xtoddx@gmail.com> Will Kelly <the.william.kelly@gmail.com> Vishvananda Ishaya <vishvananda@gmail.com> +Yaguang Tang <heut2008@gmail.com> Yogeshwar Srikrishnan <yoga80@yahoo.com> Yuriy Taraday <yorik.sar@gmail.com> Ziad Sawalha <github@highbridgellc.com> 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) |