Merge "Allow additional port_vnic_type"
This commit is contained in:
commit
7b9db954bb
|
@ -761,11 +761,13 @@ NetworkGroup = [
|
||||||
deprecated_reason="This config option is no longer "
|
deprecated_reason="This config option is no longer "
|
||||||
"used anywhere, so it can be removed."),
|
"used anywhere, so it can be removed."),
|
||||||
cfg.StrOpt('port_vnic_type',
|
cfg.StrOpt('port_vnic_type',
|
||||||
choices=[None, 'normal', 'direct', 'macvtap'],
|
choices=[None, 'normal', 'direct', 'macvtap', 'direct-physical',
|
||||||
|
'baremetal', 'virtio-forwarder'],
|
||||||
help="vnic_type to use when launching instances"
|
help="vnic_type to use when launching instances"
|
||||||
" with pre-configured ports."
|
" with pre-configured ports."
|
||||||
" Supported ports are:"
|
" Supported ports are:"
|
||||||
" ['normal','direct','macvtap']"),
|
" ['normal', 'direct', 'macvtap', 'direct-physical', "
|
||||||
|
"'baremetal', 'virtio-forwarder']"),
|
||||||
cfg.Opt('port_profile',
|
cfg.Opt('port_profile',
|
||||||
type=ProfileType,
|
type=ProfileType,
|
||||||
default={},
|
default={},
|
||||||
|
|
|
@ -201,6 +201,14 @@ class ScenarioTest(tempest.test.BaseTestCase):
|
||||||
direct: an SR-IOV port that is directly attached to a VM
|
direct: an SR-IOV port that is directly attached to a VM
|
||||||
macvtap: an SR-IOV port that is attached to a VM via a macvtap
|
macvtap: an SR-IOV port that is attached to a VM via a macvtap
|
||||||
device.
|
device.
|
||||||
|
direct-physical: an SR-IOV port that is directly attached to a
|
||||||
|
VM using physical instead of virtual
|
||||||
|
functions.
|
||||||
|
baremetal: a baremetal port directly attached to a baremetal
|
||||||
|
node.
|
||||||
|
virtio-forwarder: an SR-IOV port that is indirectly attached
|
||||||
|
to a VM using a low-latency vhost-user
|
||||||
|
forwarding process.
|
||||||
Defaults to ``CONF.network.port_vnic_type``.
|
Defaults to ``CONF.network.port_vnic_type``.
|
||||||
* *port_profile* (``dict``) --
|
* *port_profile* (``dict``) --
|
||||||
This attribute is a dictionary that can be used (with admin
|
This attribute is a dictionary that can be used (with admin
|
||||||
|
|
Loading…
Reference in New Issue