From 3b765c82531d9c5704854443e49f1accb5995a0e Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 6 Mar 2013 14:39:48 -0600
Subject: [PATCH] Clean up args and help strings in server commands
Help string corrections and align args with wiki at
https://wiki.openstack.org/wiki/UnifiedCLI/Mapping#server
Change-Id: Ifd6f587d383534142003277e64532f77ecb37106
---
openstackclient/compute/v2/server.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 24566a665f..898614b567 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -165,11 +165,11 @@ class CreateServer(show.ShowOne):
parser.add_argument(
'--user-data',
metavar='<user-data>',
- help='User data file to be serverd by the metadata server')
+ help='User data file to serve from the metadata server')
parser.add_argument(
'--availability-zone',
metavar='<zone-name>',
- help='Keypair to inject into this server')
+ help='Select an availability zone for the server')
parser.add_argument(
'--block-device-mapping',
metavar='<dev-name=mapping>',
@@ -212,7 +212,7 @@ class CreateServer(show.ShowOne):
'--wait',
dest='wait',
action='store_true',
- help='Wait for server to become active to return')
+ help='Wait for servers to become active')
return parser
def take_action(self, parsed_args):
@@ -362,10 +362,6 @@ class ListServer(lister.Lister):
'--name',
metavar='<name>',
help='regular expression to match name')
- parser.add_argument(
- '--instance-name',
- metavar='<server-name>',
- help='regular expression to match instance name')
parser.add_argument(
'--status',
metavar='<status>',
@@ -383,6 +379,10 @@ class ListServer(lister.Lister):
'--host',
metavar='<hostname>',
help='search by hostname')
+ parser.add_argument(
+ '--instance-name',
+ metavar='<server-name>',
+ help='regular expression to match instance name (admin only)')
parser.add_argument(
'--all-tenants',
action='store_true',
@@ -505,8 +505,8 @@ class RebuildServer(show.ShowOne):
required=True,
help='Recreate server from this image')
parser.add_argument(
- '--rebuild-password',
- metavar='<rebuild_password>',
+ '--password',
+ metavar='<password>',
default=False,
help="Set the provided password on the rebuild instance")
parser.add_argument(