openstack/deb-keystone
Code Issues Proposed changes

Merge "fix the default values for token and password auth"

Browse Source
This commit is contained in:
Jenkins 2013-08-22 14:49:12 +00:00 committed by Gerrit Code Review
commit 15ffd4f017
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/common/config.py
View File

@ -223,9 +223,9 @@ FILE_OPTIONS = {
'auth': [
cfg.ListOpt('methods', default=_DEFAULT_AUTH_METHODS),
cfg.StrOpt('password',
default='keystone.auth.plugins.token.Token'),
cfg.StrOpt('token',
default='keystone.auth.plugins.password.Password'),
cfg.StrOpt('token',
default='keystone.auth.plugins.token.Token'),
#deals with REMOTE_USER authentication
cfg.StrOpt('external',
default='keystone.auth.plugins.external.ExternalDefault')],

6
keystone/tests/test_config.py
View File

@ -17,3 +17,9 @@ class ConfigTestCase(test.TestCase):
self.opt_in_group('paste_deploy', config_file='')
self.assertEqual(config.find_paste_config(),
test.etcdir('keystone.conf.sample'))
def test_config_default(self):
self.assertEqual('keystone.auth.plugins.password.Password',
CONF.auth.password)
self.assertEqual('keystone.auth.plugins.token.Token',
CONF.auth.token)