diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-05 13:56:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-05 13:56:11 +0000 |
| commit | 572f470eca96a2def2161ea97563dd96aeea39f7 (patch) | |
| tree | 114ac724acb4e87da97eb0c77e82f1152d64471b | |
| parent | 8e4a1ebc97d30bcaf42a94379d499bd1689c3c51 (diff) | |
| parent | d71a90220397f1baa80e943a37854a5be2c8726c (diff) | |
| download | os-client-config-572f470eca96a2def2161ea97563dd96aeea39f7.tar.gz | |
Merge "Revert "Fix precedence for pass-in options""
| -rw-r--r-- | os_client_config/config.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index d1b3144..beea4c4 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -888,14 +888,14 @@ class OpenStackConfig(object): plugin_options = loader.get_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 but not in config we're good + # if it's in config.auth, win, kill it from config dict + # if it's in config and not in config.auth, move it # deprecated loses to current # provided beats default, deprecated or not - winning_value = self._find_winning_auth_value(p_opt, config) + winning_value = self._find_winning_auth_value( + p_opt, config['auth']) if not winning_value: - winning_value = self._find_winning_auth_value( - p_opt, config['auth']) + winning_value = self._find_winning_auth_value(p_opt, config) # Clean up after ourselves for opt in [p_opt.name] + [o.name for o in p_opt.deprecated]: |