Merge "Deprecate OvsDpdkDriverType parameter"

deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml

@@ -83,7 +83,7 @@ parameters:
   OvsDpdkDriverType:
     default: "vfio-pci"
     description: >
-      DPDK Driver type. Ensure the Overcloud NIC to be used for DPDK supports
+      (DEPRECATED) DPDK Driver type. Ensure the Overcloud NIC to be used for DPDK supports
       this UIO/PMD driver.
     type: string
     tags:
@@ -174,6 +174,13 @@ conditions:
   is_realtime:
     equals: [{get_param: [RoleParameters, TunedProfileName]}, 'realtime-virtual-host']
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed.
+  parameters:
+  - OvsDpdkDriverType
+
 resources:
   RoleParametersDpdk:
     type: OS::Heat::Value

environments/services/neutron-ovs-dpdk.yaml

@@ -11,6 +11,5 @@ parameter_defaults:
     - ComputeCapabilitiesFilter
     - ImagePropertiesFilter
     - NUMATopologyFilter
-  OvsDpdkDriverType: "vfio-pci"
   NeutronPluginExtensions: "qos,port_security"
 

releasenotes/notes/dpdk_driver_remove-76d61711c19cd099.yaml

@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    ``OvsDpdkDriverType`` is now deprecated. Note that is had no effect since we
+    upgraded to OVS 2.6, where we stopped supporting the configuration of DPDK driver
+    in puppet-vswitch. Since then, we couldn't change the driver; so we can safely
+    deprecate this parameter and remove it in a future release.