diff options
| author | Ziad Sawalha <ziad.sawalha@rackspace.com> | 2011-07-08 14:06:49 -0700 |
|---|---|---|
| committer | Ziad Sawalha <ziad.sawalha@rackspace.com> | 2011-07-08 14:06:49 -0700 |
| commit | ebe8e255ac42c07da7bfc44fd19c1f052d3f8853 (patch) | |
| tree | 6523f26ec7c2a41de525d97ff3ae3f97e12dbde3 /bin/keystone | |
| parent | 9528697d2fcfbe9b7ba1d445280d10dc4c8e1e8d (diff) | |
| parent | 418a9e5913fe25fb4c5e704655d2497da3bc5d41 (diff) | |
| download | keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.tar.gz keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.tar.xz keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.zip | |
Merge pull request #82 from dolph/master
Global fixes for issues #33 and #65
Diffstat (limited to 'bin/keystone')
| -rwxr-xr-x | bin/keystone | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bin/keystone b/bin/keystone index 4664f80d..1725ed25 100755 --- a/bin/keystone +++ b/bin/keystone @@ -69,20 +69,20 @@ if __name__ == '__main__': config_file = config.find_config_file(options, args) print "Using config file:", config_file - # Load API server + # Load Public API server server = wsgi.Server() - server.start(app, int(conf['server_bind_port']), - conf['server_bind_host']) - print "Service API listening on %s:%s" % (conf['server_bind_host'], - conf['server_bind_port']) - + server.start(app, int(conf['public_port']), conf['public_host']) + + print "Service API listening on %s:%s" % ( + conf['public_host'], conf['public_port']) + # Load Admin API server admin_server = wsgi.Server() - admin_bind = options.get('admin_port') or admin_conf.get('bind_port') - admin_server.start(admin_app, int(admin_bind), - admin_conf['bind_host']) - print "Admin API listening on %s:%s" % (admin_conf['bind_host'], - admin_bind) + admin_server.start(admin_app, + int(conf['admin_port']), conf['admin_host']) + + print "Admin API listening on %s:%s" % ( + conf['admin_host'], conf['admin_port']) # Wait until done server.wait() |