diff --git a/manifests/plugins/ml2/mech_driver.pp b/manifests/plugins/ml2/mech_driver.pp index 3c1d8b0e5..77e3b0a8b 100644 --- a/manifests/plugins/ml2/mech_driver.pp +++ b/manifests/plugins/ml2/mech_driver.pp @@ -23,6 +23,8 @@ # (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 # +# DEPRECATED PARAMETERS +# # [*ovs_vnic_type_blacklist*] # (optional) list of VNIC types for which support in Neutron is # administratively prohibited by the OVS mechanism driver @@ -33,8 +35,9 @@ # define neutron::plugins::ml2::mech_driver ( $supported_pci_vendor_devs, - $ovs_vnic_type_blacklist = [], - $sriov_vnic_type_blacklist = [], + # DEPRECATED PARAMETERS + $ovs_vnic_type_blacklist = undef, + $sriov_vnic_type_blacklist = undef, ){ include neutron::deps @@ -62,15 +65,19 @@ define neutron::plugins::ml2::mech_driver ( } } - if ($ovs_vnic_type_blacklist != []) { - neutron_plugin_ml2 { - 'ovs_driver/vnic_type_blacklist': value => join(any2array($ovs_vnic_type_blacklist), ','); + if ($ovs_vnic_type_blacklist != undef) { + warning('neutron::plugins::ml2::mech_driver::ovs_vnic_type_blacklist has been \ +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 != []) { - neutron_plugin_ml2 { - 'sriov_driver/vnic_type_blacklist': value => join(any2array($sriov_vnic_type_blacklist), ','); + if ($sriov_vnic_type_blacklist != undef) { + warning('neutron::plugins::ml2::mech_driver::sriov_vnic_type_blacklist has been \ +deperecated. Use neutron::plugins::ml2::sriov_driver class') + class { 'neutron::plugins::ml2::sriov_vnic_type_blacklist': + vnic_type_blacklist => $sriov_vnic_type_blacklist } } } diff --git a/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml b/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml new file mode 100644 index 000000000..578f2caf6 --- /dev/null +++ b/releasenotes/notes/deprecate-mech_driver-params-68968b6585278946.yaml @@ -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``