From 3b15b0566435ba4a11fe948b4c8c74306406da34 Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Thu, 2 Feb 2012 16:45:48 -0800
Subject: [PATCH] update keystone.conf

---
 files/keystone.conf | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/files/keystone.conf b/files/keystone.conf
index 1f5c445395..31620329c6 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -2,7 +2,18 @@
 public_port = 5000
 admin_port = 35357
 admin_token = %SERVICE_TOKEN%
-log_file = %DEST%/keystone/keystone.log
+compute_port = 3000
+verbose = True
+debug = True
+log_config = %DEST%/keystone/keystone.log
+
+# ================= Syslog Options ============================
+# Send logs to syslog (/dev/log) instead of to file specified
+# by `log-file`
+use_syslog = False
+
+# Facility to use. If unset defaults to LOG_USER.
+# syslog_log_facility = LOG_LOCAL0
 
 [sql]
 connection = %SQL_CONN%
@@ -12,20 +23,23 @@ max_pool_size = 10
 pool_timeout = 200
 
 [identity]
-driver = keystone.backends.sql.SqlIdentity
+driver = keystone.identity.backends.kvs.Identity
 
 [catalog]
-driver = keystone.backends.templated.TemplatedCatalog
+driver = keystone.catalog.backends.templated.TemplatedCatalog
 template_file = %KEYSTONE_DIR%/etc/default_catalog.templates
 
 [token]
-driver = keystone.backends.kvs.KvsToken
+driver = keystone.token.backends.kvs.Token
 
 [policy]
-driver = keystone.backends.policy.SimpleMatch
+driver = keystone.policy.backends.simple.SimpleMatch
+
+[ec2]
+driver = keystone.contrib.ec2.backends.kvs.Ec2
 
 [filter:debug]
-paste.filter_factory = keystone.wsgi:Debug.factory
+paste.filter_factory = keystone.common.wsgi:Debug.factory
 
 [filter:token_auth]
 paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
@@ -37,8 +51,10 @@ paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
 paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
 
 [filter:crud_extension]
-paste.filter_factory = keystone.service:AdminCrudExtension.factory
+paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory
 
+[filter:ec2_extension]
+paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory
 
 [app:public_service]
 paste.app_factory = keystone.service:public_app_factory
@@ -47,10 +63,10 @@ paste.app_factory = keystone.service:public_app_factory
 paste.app_factory = keystone.service:admin_app_factory
 
 [pipeline:public_api]
-pipeline = token_auth admin_token_auth json_body debug public_service
+pipeline = token_auth admin_token_auth json_body debug ec2_extension public_service
 
 [pipeline:admin_api]
-pipeline = token_auth admin_token_auth json_body debug crud_extension admin_service
+pipeline = token_auth admin_token_auth json_body debug ec2_extension crud_extension admin_service
 
 [composite:main]
 use = egg:Paste#urlmap