openstack
/
keystone
Code Issues Proposed changes

Name changes suggested by Ziad.

This commit is contained in:
Yogeshwar Srikrishnan 2011-06-09 10:35:36 -05:00
parent 49a644a259
commit d99811e99b
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/keystone-auth
View File

@ -49,23 +49,24 @@ if __name__ == '__main__':
# Parse arguments and load config
(options, args) = config.parse_options(parser)
debug = options.get('debug') or conf.get('debug', False)
debug = debug in [True, "True", "1"]
verbose = options.get('verbose') or conf.get('verbose', False)
verbose = verbose in [True, "True", "1"]
if debug or verbose:
config_file = config.find_config_file(options, args)
print "Using config file:", config_file
# Start services
try:
# Load Service API server
conf, app = config.load_paste_app('server', options, args)
conf, app = config.load_paste_app('keystone-legacy-auth', options, args)
debug = options.get('debug') or conf.get('debug', False)
debug = debug in [True, "True", "1"]
verbose = options.get('verbose') or conf.get('verbose', False)
verbose = verbose in [True, "True", "1"]
if debug or verbose:
config_file = config.find_config_file(options, args)
print "Using config file:", config_file
server = wsgi.Server()
server.start(app, int(conf['server_bind_port']),
conf['server_bind_host'])
print "Service API listening on %s:%s" % (conf['bind_host'],
conf['bind_port'])
print "Service API listening on %s:%s" % (conf['server_bind_host'],
conf['server_bind_port'])
server.wait()
except RuntimeError, e:
sys.exit("ERROR: %s" % e)

6
etc/keystone.conf Normal file → Executable file
View File

@ -50,9 +50,9 @@ paste.app_factory = keystone.server:app_factory
[pipeline:keystone-legacy-auth]
pipeline =
rackspace_legacy_auth
legacy_auth
server
[filter:rackspace_legacy_auth]
paste.filter_factory = keystone.frontends.legacy_auth_frontend:filter_factory
[filter:legacy_auth]
paste.filter_factory = keystone.frontends.legacy_token_auth:filter_factory