summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-19 14:23:12 +0000
committerGerrit Code Review <review@openstack.org>2015-04-19 14:23:12 +0000
commit2c6a5ca53ae574b5c4f61d2d3c8937039e40a615 (patch)
tree120cbbcc76fd143c0c99939c919e03dd1885bdcf /doc/source/command-objects
parent3f84731637f63bfb931f3487edfc091058658a83 (diff)
parente85971b1a6bb533c6169161ead7b34c910f98e5f (diff)
downloadpython-openstackclient-2c6a5ca53ae574b5c4f61d2d3c8937039e40a615.tar.gz
Merge "Update the docs for new nic options"
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/server.rst11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 34555580..f9ea5908 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -67,7 +67,7 @@ Create a new server
[--user-data <user-data>]
[--availability-zone <zone-name>]
[--block-device-mapping <dev-name=mapping> [...] ]
- [--nic <net-id=net-uuid,v4-fixed-ip=ip-addr> [...] ]
+ [--nic <net-id=net-uuid,v4-fixed-ip=ip-addr,v6-fixed-ip=ip-addr,port-id=port-uuid> [...] ]
[--hint <key=value> [...] ]
[--config-drive <value>|True ]
[--min <count>]
@@ -115,9 +115,14 @@ Create a new server
Map block devices; map is <id>:<type>:<size(GB)>:<delete_on_terminate> (optional extension)
-.. option:: --nic <nic-config-string>
+.. option:: --nic <net-id=net-uuid,v4-fixed-ip=ip-addr,v6-fixed-ip=ip-addr,port-id=port-uuid>
- Specify NIC configuration (optional extension)
+ 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).
.. option:: --hint <key=value>