openstack/python-openstackclient
Code Issues Proposed changes

Update the docs for new nic options

Browse Source 
Change-Id: I4c8b93ede80f993eab8badfbba6bf1c530844d54
This commit is contained in:
Steve Martinelli 2015-04-19 01:43:40 -04:00
parent a5e79d58ae
commit e85971b1a6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/source/command-objects/server.rst
View File

@ -67,7 +67,7 @@ Create a new server
[--user-data <user-data>] [--user-data <user-data>]
[--availability-zone <zone-name>] [--availability-zone <zone-name>]
[--block-device-mapping <dev-name=mapping> [...] ] [--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> [...] ] [--hint <key=value> [...] ]
[--config-drive <value>|True ] [--config-drive <value>|True ]
[--min <count>] [--min <count>]
@ -115,9 +115,14 @@ Create a new server
Map block devices; map is <id>:<type>:<size(GB)>:<delete_on_terminate> (optional extension) 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> .. option:: --hint <key=value>

2
openstackclient/compute/v2/server.py
View File

@ -285,7 +285,7 @@ class CreateServer(show.ShowOne):
"net-id: attach NIC to network with this UUID, " "net-id: attach NIC to network with this UUID, "
"port-id: attach NIC to port with this UUID, " "port-id: attach NIC to port with this UUID, "
"v4-fixed-ip: IPv4 fixed address for NIC (optional), " "v4-fixed-ip: IPv4 fixed address for NIC (optional), "
"v6-fixed-ip: IPv6 fixed address for NIC (optional), "), "v6-fixed-ip: IPv6 fixed address for NIC (optional)."),
) )
parser.add_argument( parser.add_argument(
'--hint', '--hint',