diff options
| author | Monty Taylor <mordred@inaugust.com> | 2016-08-04 20:45:49 +0000 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2016-08-04 20:45:49 +0000 |
| commit | d71a90220397f1baa80e943a37854a5be2c8726c (patch) | |
| tree | 8f1d9ba6805d30616f018ddab733b9eb654f2e2d | |
| parent | 05b3c933b34e9cec9eb859a15392862918b3eb5f (diff) | |
| download | os-client-config-d71a90220397f1baa80e943a37854a5be2c8726c.tar.gz | |
Revert "Fix precedence for pass-in options"
This reverts commit 05b3c933b34e9cec9eb859a15392862918b3eb5f.
Change-Id: I07dd701ca911cd12701519d2e6d624c69baa0848
| -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 0f19dd1..f1df797 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -885,14 +885,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]: |