diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-24 19:51:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-24 19:51:30 +0000 |
| commit | 55d9eba0937944119e6209c85005980c7297d123 (patch) | |
| tree | cabac6840cde898651a0393deb60b6b36e370e82 /openstackclient/shell.py | |
| parent | 46cc7d12ad202184917822dfa16dc66d066c8538 (diff) | |
| parent | b3335b3474e559d8afb0b7f86796fbb68a0687a8 (diff) | |
| download | python-openstackclient-55d9eba0937944119e6209c85005980c7297d123.tar.gz | |
Merge "Do not set default versions in parsed args"
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 319f10de..a8b5ac4c 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -298,7 +298,9 @@ class OpenStackShell(app.App): # Loop through extensions to get API versions for mod in clientmanager.PLUGIN_MODULES: - version_opt = getattr(self.options, mod.API_VERSION_OPTION, None) + default_version = getattr(mod, 'DEFAULT_API_VERSION', None) + option = mod.API_VERSION_OPTION.replace('os_', '') + version_opt = self.cloud.config.get(option, default_version) if version_opt: api = mod.API_NAME self.api_version[api] = version_opt |