Merge "Corrects required information for floating IP creation"

This commit is contained in:
Jenkins 2015-01-20 18:44:16 +00:00 committed by Gerrit Code Review
commit e1622e573c

View File

@ -715,7 +715,7 @@
</param>'> </param>'>
<!--! floating IP parameters --> <!--! floating IP parameters -->
<!ENTITY floating-ip-addressParameter ' <!ENTITY floating-ip-addressParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
name="floating_ip_address" style="plain" type="xsd:string"> name="floating_ip_address" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@ -738,11 +738,14 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN"> xml:lang="EN">
<para>A <code>floatingip</code> object.</para> <para>A <code>floatingip</code> object. When you associate a
floating IP address with a VM, the instance has the same public IP
address each time that it boots, basically to maintain a consistent
IP address for maintaining DNS assignment.</para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY floating-network-idParameter ' <!ENTITY floating-network-idParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
name="floating_network_id" style="plain" type="csapi:uuid"> name="floating_network_id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@ -752,13 +755,18 @@
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY fixed-ip-addressParameter ' <!ENTITY fixed-ip-addressParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
name="fixed_ip_address" style="plain" type="xsd:string"> name="fixed_ip_address" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN"> xml:lang="EN">
<para>The fixed IP address associated with the floating <para>The fixed IP address associated with the floating
IP.</para> IP. If you intend to associate the floating IP with a
fixed IP at creation time, then you must indicate the
identifier of the internal port. If an internal port
has multiple associated IP addresses, the service chooses the first IP
unless you explicitly specify the parameter fixed_ip_address to select
a specific IP.</para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY lbLoadbalancersParam ' <!ENTITY lbLoadbalancersParam '