summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-17 07:04:50 +0000
committerGerrit Code Review <review@openstack.org>2015-04-17 07:04:50 +0000
commitc390d8990023a6078b7bfb98de650f84d4089179 (patch)
tree03b027d6c5a4ff16b6c6fa1a600e84641542ce41 /openstackclient
parentb72f2fb7eead6287fbdd07c369c0462586f37785 (diff)
parent459526e25dc27de309abfbd8e584c7c756dd1245 (diff)
downloadpython-openstackclient-c390d8990023a6078b7bfb98de650f84d4089179.tar.gz
Merge "Better help for --nic in create server"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 49ef18b2..e672819b 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -275,10 +275,17 @@ class CreateServer(show.ShowOne):
)
parser.add_argument(
'--nic',
- metavar='<nic-config-string>',
+ metavar="<net-id=net-uuid,v4-fixed-ip=ip-addr,v6-fixed-ip=ip-addr,"
+ "port-id=port-uuid>",
action='append',
default=[],
- help=_('Specify NIC configuration (optional extension)'),
+ help=_("Create a NIC on the server. "
+ "Specify option multiple times to create multiple NICs. "
+ "Either net-id or port-id must be provided, but not both. "
+ "net-id: attach NIC to network with this UUID, "
+ "port-id: attach NIC to port with this UUID, "
+ "v4-fixed-ip: IPv4 fixed address for NIC (optional), "
+ "v6-fixed-ip: IPv6 fixed address for NIC (optional), "),
)
parser.add_argument(
'--hint',