From 7d138b94eccdc30487d3aa95c8bd6338933eefe6 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 29 Jul 2013 12:28:53 -0500
Subject: Remove tenant round 3 - other commands

Mostly options and help strings:
* image, server, project usage, volume

Change-Id: I788b0660f8c2daacde53c20a72dd1afc60cf5159
---
 openstackclient/volume/v1/volume.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'openstackclient/volume/v1')

diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 97f8d31d..c6690fd6 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -179,10 +179,10 @@ class ListVolume(lister.Lister):
             help='Filter results by name',
         )
         parser.add_argument(
-            '--all-tenants',
+            '--all-projects',
             action='store_true',
             default=False,
-            help='Display information from all tenants (admin only)',
+            help='Include all projects (admin only)',
         )
         parser.add_argument(
             '--long',
@@ -232,7 +232,7 @@ class ListVolume(lister.Lister):
                 'Attached',
             )
         search_opts = {
-            'all_tenants': parsed_args.all_tenants,
+            'all_tenants': parsed_args.all_projects,
             'display_name': parsed_args.name,
             'status': parsed_args.status,
         }
@@ -322,7 +322,11 @@ class ShowVolume(show.ShowOne):
         volume._info.update(
             {'properties': utils.format_dict(volume._info.pop('metadata'))}
         )
-
+        if 'os-vol-tenant-attr:tenant_id' in volume._info:
+            volume._info.update(
+                {'project_id': volume._info.pop(
+                    'os-vol-tenant-attr:tenant_id')}
+            )
         return zip(*sorted(six.iteritems(volume._info)))
 
 
-- 
cgit v1.2.1