summaryrefslogtreecommitdiff
path: root/openstackclient/common/module.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-22 22:51:28 +0000
committerGerrit Code Review <review@openstack.org>2017-02-22 22:51:28 +0000
commitc8435f2d5a31731e3f25f9ed14fa54f8cb372eee (patch)
tree5999b33fb74045a18cf5396cc05015bab6e52202 /openstackclient/common/module.py
parent3746fd2caf1dd3853a4def5f8f5f228bb1b1871a (diff)
parent10f0300f704ca8dd5928d9a8b41ac6c16732f203 (diff)
downloadpython-openstackclient-c8435f2d5a31731e3f25f9ed14fa54f8cb372eee.tar.gz
Merge "Show openstacksdk version info in "module list""
Diffstat (limited to 'openstackclient/common/module.py')
-rw-r--r--openstackclient/common/module.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/openstackclient/common/module.py b/openstackclient/common/module.py
index f471b2aa..ba911ecb 100644
--- a/openstackclient/common/module.py
+++ b/openstackclient/common/module.py
@@ -86,7 +86,15 @@ class ListModule(command.ShowOne):
# Handle xxxclient and openstacksdk
(k.endswith('client') or k == 'openstack')):
try:
- data[k] = mods[k].__version__
+ # NOTE(RuiChen): openstacksdk bug/1588823 exist,
+ # no good way to add __version__ for
+ # openstack module properly, hard code
+ # looks bad, but openstacksdk module
+ # information is important.
+ if k == 'openstack':
+ data[k] = mods[k].version.__version__
+ else:
+ data[k] = mods[k].__version__
except Exception:
# Catch all exceptions, just skip it
pass