openstack/puppet-neutron
Code Issues Proposed changes

Deprecate duplicated parameters for vnic_type_blacklist

Browse Source 
... because now the vnic_type_blacklist parameters are implemeted in
ovs_driver and sriov_driver class.

Change-Id: Iaa52568d7a1c8bde97a24e87ead863c46a28b408
This commit is contained in:
Takashi Kajinami 2020-10-10 13:02:13 +09:00
parent 0b8a90ec5c
commit 28ca6097fc
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,8 @@
# (required) Supported PCI vendor devices, defined by vendor_id:product_id according # (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. Default enables support for Intel and Mellanox SR-IOV capable NICs
# #
# DEPRECATED PARAMETERS
#
# [*ovs_vnic_type_blacklist*] # [*ovs_vnic_type_blacklist*]
# (optional) list of VNIC types for which support in Neutron is # (optional) list of VNIC types for which support in Neutron is
# administratively prohibited by the OVS mechanism driver # administratively prohibited by the OVS mechanism driver
@ -33,8 +35,9 @@
# #
define neutron::plugins::ml2::mech_driver ( define neutron::plugins::ml2::mech_driver (
$supported_pci_vendor_devs, $supported_pci_vendor_devs,
$ovs_vnic_type_blacklist = [], # DEPRECATED PARAMETERS
$sriov_vnic_type_blacklist = [], $ovs_vnic_type_blacklist = undef,
$sriov_vnic_type_blacklist = undef,
){ ){
include neutron::deps include neutron::deps
@ -62,15 +65,19 @@ define neutron::plugins::ml2::mech_driver (
} }
} }
if ($ovs_vnic_type_blacklist != []) { if ($ovs_vnic_type_blacklist != undef) {
neutron_plugin_ml2 { warning('neutron::plugins::ml2::mech_driver::ovs_vnic_type_blacklist has been \
'ovs_driver/vnic_type_blacklist': value => join(any2array($ovs_vnic_type_blacklist), ','); deperecated. Use neutron::plugins::ml2::ovs_driver class')
class { 'neutron::plugins::ml2::ovs_driver':
vnic_type_blacklist => $ovs_vnic_type_blacklist
} }
} }
if ($sriov_vnic_type_blacklist != []) { if ($sriov_vnic_type_blacklist != undef) {
neutron_plugin_ml2 { warning('neutron::plugins::ml2::mech_driver::sriov_vnic_type_blacklist has been \
'sriov_driver/vnic_type_blacklist': value => join(any2array($sriov_vnic_type_blacklist), ','); deperecated. Use neutron::plugins::ml2::sriov_driver class')
class { 'neutron::plugins::ml2::sriov_vnic_type_blacklist':
vnic_type_blacklist => $sriov_vnic_type_blacklist
} }
} }
} }

9
releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml Normal file
View File

@ -0,0 +1,9 @@
---
deprecations:
- |
The following parameters in the ``neutron::plugins::ml2:mech_driver`` class
have been deprecated and will be removed in a future release.
Use ``ovs_driver`` class or ``sriov_driver`` class instead.
- ``ovs_vnic_type_blacklist``
- ``sriov_vnic_type_blacklist``