openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Deprecate the mech_driver defined resource type"

This commit is contained in:
Zuul 2022-05-11 19:37:08 +00:00 committed by Gerrit Code Review
parent 9d4b348671 069b2226a9
commit e046811edb
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/plugins/ml2/mech_driver.pp
View File

@ -21,34 +21,15 @@
#
# [*supported_pci_vendor_devs*]
# (required) Supported PCI vendor devices, defined by vendor_id:product_id according
# to the PCI ID Repository. Default enables support for Intel and Mellanox SR-IOV capable NICs
# to the PCI ID Repository.
#
define neutron::plugins::ml2::mech_driver (
$supported_pci_vendor_devs,
$supported_pci_vendor_devs = undef,
){
include neutron::deps
if ($name == 'sriovnicswitch') {
neutron_plugin_sriov {
'ml2_sriov/supported_pci_vendor_devs': value => join(any2array($supported_pci_vendor_devs), ',');
}
case $::osfamily {
'RedHat': {
file { '/etc/neutron/conf.d/neutron-server/ml2_conf_sriov.conf':
ensure => link,
target => '/etc/neutron/plugins/ml2/ml2_conf_sriov.ini',
}
}
/^(Debian|Ubuntu)$/: {
file_line { 'DAEMON_ARGS':
path => '/etc/default/neutron-server',
line => 'DAEMON_ARGS="$DAEMON_ARGS --config-file /etc/neutron/plugins/ml2/ml2_conf_sriov.ini"',
}
}
default: {
fail("Unsupported osfamily ${::osfamily}")
}
}
}
warning('The neutron::plugins::ml2::mech_driver defined resource type has been deprecated \
and has no effect now.')
}

6
releasenotes/notes/deprecate-mech_driver-resource-type-377a0f596624ad81.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``neutron::plugins::ml2::mech_driver`` defined resource type has been
deprecated and has no effect. This defined type was quite outdated and
its implementation was no longer compatible with the recent versions.