diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-15 18:48:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-15 18:48:21 +0000 |
| commit | 8728466a15933329b4d2c46661f15c303e64ceac (patch) | |
| tree | 71c473fefab439cf2d03a1252156fe2c0294b327 | |
| parent | da999f42566fc6783c8b8f8f83c7f665797f1787 (diff) | |
| parent | 475193b11dcda3b8c82a6bdd3faa54607d2b3272 (diff) | |
| download | glance-8728466a15933329b4d2c46661f15c303e64ceac.tar.gz | |
Merge "vmware does't support VirtualSriovEthernetCard"
| -rw-r--r-- | api-ref/source/v2/samples/metadef-properties-list-response.json | 3 | ||||
| -rw-r--r-- | doc/source/admin/useful-image-properties.rst | 3 | ||||
| -rw-r--r-- | etc/metadefs/compute-vmware.json | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/api-ref/source/v2/samples/metadef-properties-list-response.json b/api-ref/source/v2/samples/metadef-properties-list-response.json index 7b34385aa..b373e8cdd 100644 --- a/api-ref/source/v2/samples/metadef-properties-list-response.json +++ b/api-ref/source/v2/samples/metadef-properties-list-response.json @@ -59,7 +59,7 @@ "type": "integer" }, "hw_vif_model": { - "description": "Specifies the model of virtual network interface device to use. The valid options depend on the configured hypervisor. KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, virtio, e1000e and vmxnet3. VMware: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.", + "description": "Specifies the model of virtual network interface device to use. The valid options depend on the configured hypervisor. KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, virtio, e1000e and vmxnet3. VMware: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, and VirtualVmxnet. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.", "enum": [ "e1000", "ne2k_pci", @@ -71,7 +71,6 @@ "VirtualE1000", "VirtualE1000e", "VirtualPCNet32", - "VirtualSriovEthernetCard", "VirtualVmxnet", "netfront", "ne2k_pci" diff --git a/doc/source/admin/useful-image-properties.rst b/doc/source/admin/useful-image-properties.rst index 0f36e9fdf..934e1f1a1 100644 --- a/doc/source/admin/useful-image-properties.rst +++ b/doc/source/admin/useful-image-properties.rst @@ -639,8 +639,7 @@ Here is a list of useful image properties and the values they expect. * ``KVM`` and ``QEMU``: ``e1000``, ``e1000e``, ``ne2k_pci``, ``pcnet``, ``rtl8139``, ``virtio`` and vmxnet3``. * VMware: ``e1000``, ``e1000e``, ``VirtualE1000``, ``VirtualE1000e``, - ``VirtualPCNet32``, ``VirtualSriovEthernetCard``, ``VirtualVmxnet`` - and ``VirtualVmxnet3``. + ``VirtualPCNet32``, ``VirtualVmxnet`` and ``VirtualVmxnet3``. * Xen: ``e1000``, ``netfront``, ``ne2k_pci``, ``pcnet``, and ``rtl8139``. diff --git a/etc/metadefs/compute-vmware.json b/etc/metadefs/compute-vmware.json index 460bec825..7ea8c3287 100644 --- a/etc/metadefs/compute-vmware.json +++ b/etc/metadefs/compute-vmware.json @@ -193,7 +193,7 @@ }, "hw_vif_model": { "title": "Virtual Network Interface", - "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor. VMware driver supported options: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet.", + "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor. VMware driver supported options: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, and VirtualVmxnet.", "type": "string", "enum": [ "e1000", @@ -201,7 +201,6 @@ "VirtualE1000", "VirtualE1000e", "VirtualPCNet32", - "VirtualSriovEthernetCard", "VirtualVmxnet", "VirtualVmxnet3" ], |