openstack
/
keystone
Code Issues Proposed changes

Merge "Cleanup sample config"

This commit is contained in:
Jenkins 2014-02-12 19:38:25 +00:00 committed by Gerrit Code Review
parent 14a43b0e54 dcb6bcbc4e
commit 92ce4a1542
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/keystone.conf.sample
View File

@ -493,11 +493,10 @@
# user_additional_attribute_mapping = # user_additional_attribute_mapping =
[auth] [auth]
methods = external,password,token,oauth1 # methods = external,password,token
# external = keystone.auth.plugins.external.DefaultDomain # external = keystone.auth.plugins.external.DefaultDomain
password = keystone.auth.plugins.password.Password # password = keystone.auth.plugins.password.Password
token = keystone.auth.plugins.token.Token # token = keystone.auth.plugins.token.Token
oauth1 = keystone.auth.plugins.oauth1.OAuth
[memcache] [memcache]
# servers = localhost:11211 # servers = localhost:11211
@ -512,5 +511,6 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
# default_lock_timeout = 5 # default_lock_timeout = 5
[paste_deploy] [paste_deploy]
# Name of the paste configuration file that defines the available pipelines # Name of the paste configuration file, typically `keystone-paste.ini`, that
config_file = keystone-paste.ini # defines the available pipelines
# config_file =

7
keystone/tests/test_overrides.conf
View File

@ -27,3 +27,10 @@ ca_certs = examples/pki/certs/cacert.pem
[kvs] [kvs]
backends = keystone.tests.test_kvs.KVSBackendForcedKeyMangleFixture, keystone.tests.test_kvs.KVSBackendFixture backends = keystone.tests.test_kvs.KVSBackendForcedKeyMangleFixture, keystone.tests.test_kvs.KVSBackendFixture
[auth]
methods = external,password,token,oauth1
oauth1 = keystone.auth.plugins.oauth1.OAuth
[paste_deploy]
config_file = keystone-paste.ini