From dcb6bcbc4e5ba12bec75569b53551509b3e65eb5 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Mon, 3 Feb 2014 11:10:08 -0600 Subject: [PATCH] Cleanup sample config The sample config file had some options that were set rather than documenting the defaults. Change-Id: I53abba01b3683f3ad9c81d824ccf0b63c016dc87 --- etc/keystone.conf.sample | 14 +++++++------- keystone/tests/test_overrides.conf | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 36e25e763c..c23acee083 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -471,11 +471,10 @@ # user_additional_attribute_mapping = [auth] -methods = external,password,token,oauth1 -#external = keystone.auth.plugins.external.DefaultDomain -password = keystone.auth.plugins.password.Password -token = keystone.auth.plugins.token.Token -oauth1 = keystone.auth.plugins.oauth1.OAuth +# methods = external,password,token +# external = keystone.auth.plugins.external.DefaultDomain +# password = keystone.auth.plugins.password.Password +# token = keystone.auth.plugins.token.Token [memcache] # servers = localhost:11211 @@ -490,5 +489,6 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth # default_lock_timeout = 5 [paste_deploy] -# Name of the paste configuration file that defines the available pipelines -config_file = keystone-paste.ini +# Name of the paste configuration file, typically `keystone-paste.ini`, that +# defines the available pipelines +# config_file = diff --git a/keystone/tests/test_overrides.conf b/keystone/tests/test_overrides.conf index b33ad48808..a7a255b5d6 100644 --- a/keystone/tests/test_overrides.conf +++ b/keystone/tests/test_overrides.conf @@ -27,3 +27,10 @@ ca_certs = examples/pki/certs/cacert.pem [kvs] 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