summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-05-03 21:14:53 +0100
committerMark McLoughlin <markmc@redhat.com>2012-05-03 21:14:53 +0100
commitff149bec9255b1e48acd3e44023d4e5156515ff0 (patch)
tree196b8835ec3f1a87559309693c43b4ecf1551aad
parentf58ca2bdb5dbe20b8d436eefa3480b668c1b6e2d (diff)
downloadkeystone-ff149bec9255b1e48acd3e44023d4e5156515ff0.tar.gz
keystone-ff149bec9255b1e48acd3e44023d4e5156515ff0.tar.xz
keystone-ff149bec9255b1e48acd3e44023d4e5156515ff0.zip
Add defaults for driver options
Avoid relying on the options being set in the config file. Change-Id: Ib5859604492096c99c6428c63b3c1d03b3fbf621
-rw-r--r--keystone/config.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/keystone/config.py b/keystone/config.py
index 41f2743f..7dfa0c87 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -150,11 +150,16 @@ register_str('connection', group='sql')
register_int('idle_timeout', group='sql')
-register_str('driver', group='catalog')
-register_str('driver', group='identity')
-register_str('driver', group='policy')
-register_str('driver', group='token')
-register_str('driver', group='ec2')
+register_str('driver', group='catalog',
+ default='keystone.catalog.backends.sql.Catalog')
+register_str('driver', group='identity',
+ default='keystone.identity.backends.sql.Identity')
+register_str('driver', group='policy',
+ default='keystone.policy.backends.rules.Policy')
+register_str('driver', group='token',
+ default='keystone.token.backends.kvs.Token')
+register_str('driver', group='ec2',
+ default='keystone.contrib.ec2.backends.kvs.Ec2')
#ldap