Merge "Revert "Deprecate SR-IOV 'physical_device_mappings' config option""

This commit is contained in:
Jenkins 2016-11-29 07:28:58 +00:00 committed by Gerrit Code Review
commit 6c46e55232
4 changed files with 1 additions and 17 deletions

View File

@ -70,10 +70,7 @@ sriov_nic_opts = [
"function to be used for VLAN networks. All physical "
"networks listed in network_vlan_ranges on the server "
"should have mappings to appropriate interfaces on "
"each agent. "
"DEPRECATED: This option is deprecated in the Ocata "
"release and will be removed in the Pike release."),
deprecated_for_removal=True),
"each agent.")),
cfg.ListOpt('exclude_devices',
default=DEFAULT_EXCLUDE_DEVICES,
help=_("Comma-separated list of "

View File

@ -347,8 +347,6 @@ class ESwitchManager(object):
embedded_switch.set_device_spoofcheck(pci_slot,
enabled)
# Note(edan): discover_devices method will be removed
# with 'physical_device_mappings'
def discover_devices(self, device_mappings, exclude_devices):
"""Discover which Virtual functions to manage.
@ -363,8 +361,6 @@ class ESwitchManager(object):
self._create_emb_switch(phys_net, dev_name,
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):
embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices)
self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch)

View File

@ -191,8 +191,6 @@ class SriovNicSwitchAgent(object):
mgr.initialize(connection, 'sriov')
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):
exclude_devices = exclude_devices or {}
self.eswitch_mgr = esm.ESwitchManager()

View File

@ -1,7 +0,0 @@
---
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.