Merge "Invalid VMware options for glance metadata"

This commit is contained in:
Jenkins 2015-06-25 07:02:36 +00:00 committed by Gerrit Code Review
commit 9ece4db3fe

View File

@ -414,39 +414,6 @@
<td>Currently unused.</td>
<td><literal>1</literal></td>
</tr>
<tr valign="top">
<td>VMware API driver</td>
<td>quota:cpu_limit</td>
<td>Specifies the upper limit for CPU allocation in MHz.
This parameter ensures that a machine never uses more than the defined amount of CPU time.
It can be used to enforce a limit on the machine's CPU performance.
</td>
<td>A numerical value in MHz</td>
</tr>
<tr valign="top">
<td>VMware API driver</td>
<td>quota:cpu_reservation</td>
<td>Specifies the guaranteed minimum CPU reservation in MHz.
This means that if needed, the machine will definitely get allocated the reserved amount of CPU cycles.
</td>
<td>A numerical value in MHz</td>
</tr>
<tr valign="top">
<td>VMware API driver</td>
<td>vmware:hw_version</td>
<td>Specifies the hardware version VMware uses to create
images. If the hardware version needs to
be compatible with a cluster version, for backward
compatibility or other circumstances, the
<literal>vmware:hw_version</literal> key specifies
a virtual machine hardware version. In the event
that a cluster has mixed host version types, the
key will enable the VC to place the cluster on the
correct host.</td>
<td>See <link xlink:href="https://pubs.vmware.com/vsphere-55/index.jsp#
com.vmware.vsphere.hostclient.doc/GUID-68E5EDAE-66DE-43F8-9420-F424AFEADB1D.html"
>vmware.com</link>.</td>
</tr>
<tr valign="top">
<td>XenAPI driver</td>
<td>auto_disk_config</td>