x/deb-os-client-config
Code Issues Proposed changes

Merge "Revert "Fix precedence for pass-in options""

Browse Source
This commit is contained in:
Jenkins 2016-08-05 13:56:10 +00:00 committed by Gerrit Code Review
commit 572f470eca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os_client_config/config.py
View File

@ -888,14 +888,14 @@ class OpenStackConfig(object):
plugin_options = loader.get_options() plugin_options = loader.get_options()
for p_opt in plugin_options: for p_opt in plugin_options:
# if it's in config, win, move it and kill it from config dict # if it's in config.auth, win, kill it from config dict
# if it's in config.auth but not in config we're good # if it's in config and not in config.auth, move it
# deprecated loses to current # deprecated loses to current
# provided beats default, deprecated or not # provided beats default, deprecated or not
winning_value = self._find_winning_auth_value(p_opt, config)
if not winning_value:
winning_value = self._find_winning_auth_value( winning_value = self._find_winning_auth_value(
p_opt, config['auth']) p_opt, config['auth'])
if not winning_value:
winning_value = self._find_winning_auth_value(p_opt, config)
# Clean up after ourselves # Clean up after ourselves
for opt in [p_opt.name] + [o.name for o in p_opt.deprecated]: for opt in [p_opt.name] + [o.name for o in p_opt.deprecated]: