use the keystone app in the conf

2 files changed, 32 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']))
diff --git a/etc/default.conf b/etc/default.conf
new file mode 100644
index 00000000..46228239
--- /dev/null
+++ b/etc/default.conf
@@ -0,0 +1,30 @@
+[DEFAULT]
+catalog_driver = keystonelight.backends.kvs.KvsCatalog
+identity_driver = keystonelight.backends.kvs.KvsIdentity
+token_driver = keystonelight.backends.kvs.KvsToken
+public_port = 5000
+admin_token = ADMIN
+
+[filter:debug]
+paste.filter_factory = keystonelight.wsgi:Debug.factory
+
+[filter:token_auth]
+paste.filter_factory = keystonelight.service:TokenAuthMiddleware.factory
+
+[filter:admin_token_auth]
+paste.filter_factory = keystonelight.service:AdminTokenAuthMiddleware.factory
+
+[filter:json_body]
+paste.filter_factory = keystonelight.service:JsonBodyMiddleware.factory
+
+[app:keystone_compat]
+paste.app_factory = keystonelight.keystone_compat:app_factory
+
+[app:keystonelight]
+paste.app_factory = keystonelight.service:app_factory
+
+[pipeline:keystone]
+pipeline = token_auth admin_token_auth json_body debug keystone
+
+[pipeline:main]
+pipeline = token_auth admin_token_auth json_body debug keystonelight