summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-23 19:28:28 +0000
committerGerrit Code Review <review@openstack.org>2012-02-23 19:28:28 +0000
commit1ae4f4eb21abe85600dc1137146cb8d85f1c03ea (patch)
tree263fcf171eb4b4edb0149c2b99534ce53bc80d87
parentdd851ff62b04da2c2d922dea6b9c175dc44ae234 (diff)
parent169cacb67c3306412eee445f18035cc29098e145 (diff)
downloadnova-1ae4f4eb21abe85600dc1137146cb8d85f1c03ea.tar.gz
nova-1ae4f4eb21abe85600dc1137146cb8d85f1c03ea.tar.xz
nova-1ae4f4eb21abe85600dc1137146cb8d85f1c03ea.zip
Merge "bug 939480"
-rw-r--r--doc/source/vmwareapi_readme.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/source/vmwareapi_readme.rst b/doc/source/vmwareapi_readme.rst
index 5aea91a8a..2e7e97bde 100644
--- a/doc/source/vmwareapi_readme.rst
+++ b/doc/source/vmwareapi_readme.rst
@@ -65,8 +65,7 @@ Configuration flags required for nova-compute
--vmwareapi_host_ip=<VMware ESX Host IP>
--vmwareapi_host_username=<VMware ESX Username>
--vmwareapi_host_password=<VMware ESX Password>
- --network_driver=nova.network.vmwareapi_net [Optional, only for VLAN Networking]
- --vlan_interface=<Physical ethernet adapter name in VMware ESX host for vlan networking E.g vmnic0> [Optional, only for VLAN Networking]
+ --vmwareapi_vlan_interface=<Physical ethernet adapter name in VMware ESX host for vlan networking E.g vmnic0> [Optional, only for VLAN Networking]
Configuration flags required for nova-network