summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-11-14 09:57:24 -0800
committertermie <github@anarkystic.com>2011-11-14 09:57:24 -0800
commitadbbe0147e9e726db2dc6f2c2d4e446fa589c5ba (patch)
tree224b4457870869c964c1deb2d32043624a0bd14d /bin
parent6c84c1bf6a80399e7d1c9695eb01b8ba9fad1fc6 (diff)
downloadkeystone-adbbe0147e9e726db2dc6f2c2d4e446fa589c5ba.tar.gz
keystone-adbbe0147e9e726db2dc6f2c2d4e446fa589c5ba.tar.xz
keystone-adbbe0147e9e726db2dc6f2c2d4e446fa589c5ba.zip
use the keystone app in the conf
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/keystone b/bin/keystone
index f353e8f9..f9db5979 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -23,11 +23,11 @@ from keystonelight import wsgi
if __name__ == '__main__':
default_conf = os.path.join(possible_topdir,
'etc',
- 'keystone.conf')
+ 'default.conf')
logging.getLogger().setLevel(logging.DEBUG)
conf = len(sys.argv) > 1 and sys.argv[1] or default_conf
- app = deploy.loadapp('config:%s' % conf)
+ app = deploy.loadapp('config:%s' % conf, name='keystone')
server = wsgi.Server()
server.start(app, int(app.options['public_port']))
server.start(app, int(app.options['admin_port']))