diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-08 15:47:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-08 15:47:10 +0000 |
| commit | ec91bb617ebe946b36124f600070434cc658c945 (patch) | |
| tree | b579c7f9699622777379b17a2d53d8f0239b06b9 /openstackclient | |
| parent | 9b8b18053469b0f7c3e4ade87146ad83380342f7 (diff) | |
| parent | 3b765c82531d9c5704854443e49f1accb5995a0e (diff) | |
| download | python-openstackclient-ec91bb617ebe946b36124f600070434cc658c945.tar.gz | |
Merge "Clean up args and help strings in server commands"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 24566a66..898614b5 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): @@ -363,10 +363,6 @@ class ListServer(lister.Lister): 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>', # FIXME(dhellmann): Add choices? @@ -384,6 +380,10 @@ class ListServer(lister.Lister): 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', default=bool(int(os.environ.get("ALL_TENANTS", 0))), @@ -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( |