summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/keystone.conf8
-rw-r--r--tests/test_overrides.conf1
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/keystone.conf b/etc/keystone.conf
index 3ecf641e..843c5c2c 100644
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -34,8 +34,12 @@ idle_timeout = 200
driver = keystone.identity.backends.sql.Identity
[catalog]
-driver = keystone.catalog.backends.templated.TemplatedCatalog
-template_file = ./etc/default_catalog.templates
+# dynamic, sql-based backend (supports API/CLI-based management commands)
+driver = keystone.catalog.backends.sql.Catalog
+
+# static, file-based backend (does *NOT* support any management commands)
+#driver = keystone.catalog.backends.templated.TemplatedCatalog
+#template_file = ./etc/default_catalog.templates
[token]
driver = keystone.token.backends.kvs.Token
diff --git a/tests/test_overrides.conf b/tests/test_overrides.conf
index 20bc30e2..164f8253 100644
--- a/tests/test_overrides.conf
+++ b/tests/test_overrides.conf
@@ -5,4 +5,5 @@ crypt_strength = 10
driver = keystone.identity.backends.kvs.Identity
[catalog]
+driver = keystone.catalog.backends.templated.TemplatedCatalog
template_file = default_catalog.templates