diff options
| author | Dan Prince <dprince@redhat.com> | 2013-03-12 22:44:48 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-03-14 14:26:54 -0400 |
| commit | c92b276f81d32eef2c23497058002f168e358ec7 (patch) | |
| tree | 7e80452a2dd3de9416d6ce7bf225f2d272437ca0 /keystone/auth | |
| parent | d51f81ba385685c8913a3c74ea3b7b7f1b150814 (diff) | |
| download | keystone-c92b276f81d32eef2c23497058002f168e358ec7.tar.gz keystone-c92b276f81d32eef2c23497058002f168e358ec7.tar.xz keystone-c92b276f81d32eef2c23497058002f168e358ec7.zip | |
Remove duplicate password/token opts.
Consolidate the 'auth' method option registration
in config.py.
This makes it so we don't have to catch Exceptions when the
default 'auth' options are registered twice and avoids some
log WARNING messages as well.
Fixes LP Bug #1154406.
Change-Id: I301328ec3ec4823dd7fbec1e639e2841516352e5
Diffstat (limited to 'keystone/auth')
| -rw-r--r-- | keystone/auth/controllers.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index 517995dd..ba70735c 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -36,15 +36,6 @@ CONF = config.CONF AUTH_METHODS = {} -# register method drivers -for method_name in CONF.auth.methods: - try: - config.register_str(method_name, group='auth') - except Exception as e: - # don't care about duplicate error - LOG.warn(e) - - def load_auth_method(method_name): if method_name not in CONF.auth.methods: raise exception.AuthMethodNotSupported() |