summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@rackspace.com>2011-06-20 16:20:43 -0500
committerDolph Mathews <dolph.mathews@rackspace.com>2011-06-20 16:20:43 -0500
commit69db7bd755be5b8a2dfbbbffe3a62f1983cfa357 (patch)
tree37801d663342135629080adf60e3cb986d0cf6cd
parent789b22aeabcb5fdf3f0e8717930bf03c33b3ca67 (diff)
downloadkeystone-69db7bd755be5b8a2dfbbbffe3a62f1983cfa357.tar.gz
keystone-69db7bd755be5b8a2dfbbbffe3a62f1983cfa357.tar.xz
keystone-69db7bd755be5b8a2dfbbbffe3a62f1983cfa357.zip
Fixed formatting, imports
-rwxr-xr-xbin/keystone14
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/keystone b/bin/keystone
index eed99208..82e06bb2 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -36,8 +36,7 @@ if os.path.exists(os.path.join(possible_topdir, 'keystone', '__init__.py')):
import tools.tracer #@UnusedImport # module runs on import
import keystone
-from keystone.common import config
-from keystone.common import wsgi
+from keystone.common import config, wsgi
if __name__ == '__main__':
@@ -47,10 +46,9 @@ if __name__ == '__main__':
config.add_log_options(parser)
# Handle a special argument to support starting two endpoints
- common_group.add_option('-a', '--admin-port',
- dest="admin_port", metavar="PORT",
- help="specifies port for Admin API to listen"
- "on (default is 8080)")
+ common_group.add_option(
+ '-a', '--admin-port', dest="admin_port", metavar="PORT",
+ help="specifies port for Admin API to listen on (default is 8080)")
# Parse arguments and load config
(options, args) = config.parse_options(parser)
@@ -71,8 +69,8 @@ if __name__ == '__main__':
if debug or verbose:
config_file = config.find_config_file(options, args)
print "Using config file:", config_file
-
- # Load API server
+
+ # Load API server
server = wsgi.Server()
server.start(app, int(conf['server_bind_port']),
conf['server_bind_host'])