diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-03 15:00:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-03 15:00:01 +0000 |
| commit | a8a0cfe4be316455b6aa969a35baec447fc7da17 (patch) | |
| tree | 466ebfe67600118ccaf821b2b297b19a5278fe40 | |
| parent | 9d4a1d81dc0fb3388d0c0de6fa8d0e4b4f6a7bb3 (diff) | |
| parent | 05b3c933b34e9cec9eb859a15392862918b3eb5f (diff) | |
| download | os-client-config-a8a0cfe4be316455b6aa969a35baec447fc7da17.tar.gz | |
Merge "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 beea4c4..d1b3144 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.auth, win, kill it from config dict - # if it's in config and not in config.auth, move it + # 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 # deprecated loses to current # provided beats default, deprecated or not - winning_value = self._find_winning_auth_value( - p_opt, config['auth']) + winning_value = self._find_winning_auth_value(p_opt, config) if not winning_value: - winning_value = self._find_winning_auth_value(p_opt, config) + winning_value = self._find_winning_auth_value( + p_opt, config['auth']) # Clean up after ourselves for opt in [p_opt.name] + [o.name for o in p_opt.deprecated]: |