basic service running again

1 files changed, 6 insertions, 1 deletions

diff --git a/bin/keystone b/bin/keystone
index 58e7b3a9..07060817 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -18,9 +18,13 @@ if os.path.exists(os.path.join(possible_topdir,
 
 from paste import deploy
 
+from keystone import config
 from keystone import wsgi
 
 
+CONF = config.CONF
+
+
 def create_server(name, port):
     app = deploy.loadapp('config:%s' % conf, name=name)
     return wsgi.Server(app, port)
@@ -40,7 +44,8 @@ def serve(*servers):
 if __name__ == '__main__':
     default_conf = os.path.join(possible_topdir,
                                 'etc',
-                                'default.conf')
+                                'keystone.conf')
+    CONF(config_files=[default_conf])
     logging.getLogger().setLevel(logging.DEBUG)
 
     conf = len(sys.argv) > 1 and sys.argv[1] or default_conf