diff options
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 48 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 18 |
2 files changed, 35 insertions, 31 deletions
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 40418132..0b48da86 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -38,38 +38,42 @@ class CreateFlavor(show.ShowOne): metavar="<name>", help="Name of the new flavor") parser.add_argument( - "id", + "--id", metavar="<id>", - help="Unique ID (integer or UUID) for the new flavor." - " If specifying 'auto', a UUID will be generated as id") + default='auto', + help="Unique flavor ID; 'auto' will create a UUID " + "(default: auto)") parser.add_argument( - "ram", + "--ram", type=int, - metavar="<ram>", - help="Memory size in MB") + metavar="<size-mb>", + default=256, + help="Memory size in MB (default 256M)") parser.add_argument( - "disk", + "--disk", type=int, - metavar="<disk>", - help="Disk size in GB") + metavar="<size-gb>", + default=0, + help="Disk size in GB (default 0G)") parser.add_argument( "--ephemeral", type=int, - metavar="<ephemeral>", - help="Ephemeral space size in GB (default 0)", + metavar="<size-gb>", + help="Ephemeral disk size in GB (default 0G)", default=0) parser.add_argument( - "vcpus", - type=int, - metavar="<vcpus>", - help="Number of vcpus") - parser.add_argument( "--swap", type=int, - metavar="<swap>", - help="Swap space size in MB (default 0)", + metavar="<size-gb>", + help="Swap space size in GB (default 0G)", default=0) parser.add_argument( + "--vcpus", + type=int, + metavar="<vcpus>", + default=1, + help="Number of vcpus (default 1)") + parser.add_argument( "--rxtx-factor", type=int, metavar="<factor>", @@ -79,14 +83,14 @@ class CreateFlavor(show.ShowOne): public_group.add_argument( "--public", dest="public", + action="store_true", default=True, - help="Make flavor inaccessible to the public (default)", - action="store_true") + help="Flavor is accessible to the public (default)") public_group.add_argument( "--private", dest="public", - help="Make flavor inaccessible to the public", - action="store_false") + action="store_false", + help="Flavor is inaccessible to the public") return parser def take_action(self, parsed_args): 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( |