summaryrefslogtreecommitdiff
path: root/openstackclient/compute/v2/server.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-31 22:30:12 +0000
committerGerrit Code Review <review@openstack.org>2013-07-31 22:30:12 +0000
commitf293027815f43371b1133fcdf6283c6a19530556 (patch)
tree56ddcea45b5bc53ed99881a444b96cd88cec9348 /openstackclient/compute/v2/server.py
parent0f63f46a07fcb58fe325e3034eedeffc4a15ad8b (diff)
parent7d138b94eccdc30487d3aa95c8bd6338933eefe6 (diff)
downloadpython-openstackclient-0.2.alpha1.tar.gz
Merge "Remove tenant round 3 - other commands"0.2.alpha1
Diffstat (limited to 'openstackclient/compute/v2/server.py')
-rw-r--r--openstackclient/compute/v2/server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 950f0e02..1de9f1ba 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -451,10 +451,10 @@ class ListServer(lister.Lister):
metavar='<server-name>',
help='regular expression to match instance name (admin only)')
parser.add_argument(
- '--all-tenants',
+ '--all-projects',
action='store_true',
- default=bool(int(os.environ.get("ALL_TENANTS", 0))),
- help='display information from all tenants (admin only)')
+ default=bool(int(os.environ.get("ALL_PROJECTS", 0))),
+ help='Include all projects (admin only)')
parser.add_argument(
'--long',
action='store_true',
@@ -475,7 +475,7 @@ class ListServer(lister.Lister):
'flavor': parsed_args.flavor,
'image': parsed_args.image,
'host': parsed_args.host,
- 'all_tenants': parsed_args.all_tenants,
+ 'all_tenants': parsed_args.all_projects,
}
self.log.debug('search options: %s', search_opts)