Merge "Deprecate SR-IOV 'physical_device_mappings' config option"
This commit is contained in:
commit
1edd34f7c2
neutron/plugins/ml2/drivers/mech_sriov/agent
releasenotes/notes
@ -70,7 +70,10 @@ sriov_nic_opts = [
|
|||||||
"function to be used for VLAN networks. All physical "
|
"function to be used for VLAN networks. All physical "
|
||||||
"networks listed in network_vlan_ranges on the server "
|
"networks listed in network_vlan_ranges on the server "
|
||||||
"should have mappings to appropriate interfaces on "
|
"should have mappings to appropriate interfaces on "
|
||||||
"each agent.")),
|
"each agent. "
|
||||||
|
"DEPRECATED: This option is deprecated in the Ocata "
|
||||||
|
"release and will be removed in the Pike release."),
|
||||||
|
deprecated_for_removal=True),
|
||||||
cfg.ListOpt('exclude_devices',
|
cfg.ListOpt('exclude_devices',
|
||||||
default=DEFAULT_EXCLUDE_DEVICES,
|
default=DEFAULT_EXCLUDE_DEVICES,
|
||||||
help=_("Comma-separated list of "
|
help=_("Comma-separated list of "
|
||||||
|
@ -347,6 +347,8 @@ class ESwitchManager(object):
|
|||||||
embedded_switch.set_device_spoofcheck(pci_slot,
|
embedded_switch.set_device_spoofcheck(pci_slot,
|
||||||
enabled)
|
enabled)
|
||||||
|
|
||||||
|
# Note(edan): discover_devices method will be removed
|
||||||
|
# with 'physical_device_mappings'
|
||||||
def discover_devices(self, device_mappings, exclude_devices):
|
def discover_devices(self, device_mappings, exclude_devices):
|
||||||
"""Discover which Virtual functions to manage.
|
"""Discover which Virtual functions to manage.
|
||||||
|
|
||||||
@ -361,6 +363,8 @@ class ESwitchManager(object):
|
|||||||
self._create_emb_switch(phys_net, dev_name,
|
self._create_emb_switch(phys_net, dev_name,
|
||||||
exclude_devices.get(dev_name, set()))
|
exclude_devices.get(dev_name, set()))
|
||||||
|
|
||||||
|
# Note(edan): phys_net param will be removed with
|
||||||
|
# 'physical_device_mappings' config option.
|
||||||
def _create_emb_switch(self, phys_net, dev_name, exclude_devices):
|
def _create_emb_switch(self, phys_net, dev_name, exclude_devices):
|
||||||
embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices)
|
embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices)
|
||||||
self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch)
|
self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch)
|
||||||
|
@ -191,6 +191,8 @@ class SriovNicSwitchAgent(object):
|
|||||||
mgr.initialize(connection, 'sriov')
|
mgr.initialize(connection, 'sriov')
|
||||||
return mgr
|
return mgr
|
||||||
|
|
||||||
|
# Note(edan): setup_eswitch_mgr method will be removed
|
||||||
|
# with 'physical_device_mappings' config option
|
||||||
def setup_eswitch_mgr(self, device_mappings, exclude_devices=None):
|
def setup_eswitch_mgr(self, device_mappings, exclude_devices=None):
|
||||||
exclude_devices = exclude_devices or {}
|
exclude_devices = exclude_devices or {}
|
||||||
self.eswitch_mgr = esm.ESwitchManager()
|
self.eswitch_mgr = esm.ESwitchManager()
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- The 'physical_device_mappings' option is deprecated
|
||||||
|
and will be removed in Pike. The PCI device validation
|
||||||
|
is made in Nova with the 'pci_whitelist' config option.
|
||||||
|
Therefore it is redundant to validate it in Neutron
|
||||||
|
with physical_device_mappings.
|
Loading…
x
Reference in New Issue
Block a user