summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-05 09:14:43 +0000
committerGerrit Code Review <review@openstack.org>2015-12-05 09:14:43 +0000
commite93e1493b6c3cf328fc0fe430e42876f54627c72 (patch)
treebe9f9e639ee35f85e3edf1717a1007334a745af7
parenta207c27fc87595d8f59bb29436b7ccb2243a5682 (diff)
parentca76260bf803895960cea3d6f735ba98ffb85463 (diff)
downloadpython-openstackclient-e93e1493b6c3cf328fc0fe430e42876f54627c72.tar.gz
Merge "Trivial: Improve doc for "server create" command"
-rw-r--r--doc/source/command-objects/server.rst9
-rw-r--r--openstackclient/compute/v2/server.py8
2 files changed, 9 insertions, 8 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 0ff8e726..fd487b8e 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -77,19 +77,20 @@ Create a new server
.. option:: --image <image>
- Create server from this image
+ Create server from this image (name or ID)
.. option:: --volume <volume>
- Create server from this volume
+ Create server from this volume (name or ID)
.. option:: --flavor <flavor>
- Create server with this flavor
+ Create server with this flavor (name or ID)
.. option:: --security-group <security-group-name>
- Security group to assign to this server (repeat for multiple groups)
+ Security group to assign to this server (name or ID)
+ (repeat for multiple groups)
.. option:: --key-name <key-name>
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index d58ebacd..adab29c9 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -276,25 +276,25 @@ class CreateServer(show.ShowOne):
disk_group.add_argument(
'--image',
metavar='<image>',
- help=_('Create server from this image'),
+ help=_('Create server from this image (name or ID)'),
)
disk_group.add_argument(
'--volume',
metavar='<volume>',
- help=_('Create server from this volume'),
+ help=_('Create server from this volume (name or ID)'),
)
parser.add_argument(
'--flavor',
metavar='<flavor>',
required=True,
- help=_('Create server with this flavor'),
+ help=_('Create server with this flavor (name or ID)'),
)
parser.add_argument(
'--security-group',
metavar='<security-group-name>',
action='append',
default=[],
- help=_('Security group to assign to this server '
+ help=_('Security group to assign to this server (name or ID) '
'(repeat for multiple groups)'),
)
parser.add_argument(