diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-03-26 10:35:28 -0700 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-03-26 10:37:18 -0700 |
| commit | 2e172e515556a76c2febdaa52dea7be95da566c1 (patch) | |
| tree | dfe625e0f010d4723fb6bcdbaba40f6b53988001 | |
| parent | 79e93be5b931abfae55dc7299c0c43149b78e9e2 (diff) | |
| download | keystone-2e172e515556a76c2febdaa52dea7be95da566c1.tar.gz keystone-2e172e515556a76c2febdaa52dea7be95da566c1.tar.xz keystone-2e172e515556a76c2febdaa52dea7be95da566c1.zip | |
Change default catalog driver to SQL; doc the options
Change-Id: I7a713b8fb67ec099f60e35161c15a7b2b200ee8a
| -rw-r--r-- | etc/keystone.conf | 8 | ||||
| -rw-r--r-- | tests/test_overrides.conf | 1 |
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 |