summaryrefslogtreecommitdiff
path: root/heatclient/osc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-13 09:50:30 +0000
committerGerrit Code Review <review@openstack.org>2017-02-13 09:50:30 +0000
commit28cf99603a308640af604a83f3b3083ce3ad0d35 (patch)
treeaafb1da700e74e132dde8b9f1d2a5aa0a5e679fa /heatclient/osc
parent0b6aeafbf9a1873bb503f0482e4aeafd95ebfd57 (diff)
parent3ee70cf4e8c2d8505230f73ef0b6b44185567dc2 (diff)
downloadpython-heatclient-28cf99603a308640af604a83f3b3083ce3ad0d35.tar.gz
Merge "Show 'project' info if heat server returns"
Diffstat (limited to 'heatclient/osc')
-rw-r--r--heatclient/osc/v1/stack.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py
index f8cf9e3..1c044ae 100644
--- a/heatclient/osc/v1/stack.py
+++ b/heatclient/osc/v1/stack.py
@@ -631,8 +631,6 @@ def _list(client, args=None):
columns.pop()
if args.long:
columns.insert(2, 'Stack Owner')
- if args.long or args.all_projects:
- columns.insert(2, 'Project')
if args.nested:
columns.append('Parent')
@@ -642,6 +640,11 @@ def _list(client, args=None):
columns.append('Deletion Time')
data = client.stacks.list(**kwargs)
+ data = list(data)
+ for stk in data:
+ if hasattr(stk, 'project'):
+ columns.insert(2, 'Project')
+ break
data = utils.sort_items(data, args.sort if args else None)
return (