From 3156018f425ad590e2118e9da8de90a635b37fc2 Mon Sep 17 00:00:00 2001 From: Jonathan Kinred Date: Thu, 14 Jan 2016 09:30:45 +1100 Subject: [PATCH] Update doco for ip enhancements in vmware-govcd --- website/source/docs/providers/vcd/r/vapp.html.markdown | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/website/source/docs/providers/vcd/r/vapp.html.markdown b/website/source/docs/providers/vcd/r/vapp.html.markdown index 0a2a2e234..61ed43cb7 100644 --- a/website/source/docs/providers/vcd/r/vapp.html.markdown +++ b/website/source/docs/providers/vcd/r/vapp.html.markdown @@ -52,8 +52,10 @@ The following arguments are supported: * `network_href` - (Optional) The vCloud Director generated href of the network this vApp should join. If empty it will use the network name and query vCloud Director to discover this -* `ip` - (Optional) The IP to assign to this vApp. If given the address must be within the `static_ip_pool` - set for the network. If left blank, and the network has `dhcp_pool` set with at least one available IP then - this will be set with DHCP +* `ip` - (Optional) The IP to assign to this vApp. Must be an IP address or + one of dhcp, allocated or none. If given the address must be within the + `static_ip_pool` set for the network. If left blank, and the network has + `dhcp_pool` set with at least one available IP then this will be set with + DHCP. * `metadata` - (Optional) Key value map of metadata to assign to this vApp * `power_on` - (Optional) A boolean value stating if this vApp should be powered on. Default to `true`