Merge "Remove the OVS-DPDK deprecated parameters"

extraconfig/pre_network/host_config_and_reboot.yaml

@@ -105,30 +105,6 @@ parameters:
       systemd and repin interrupts (IRQ repinning).
     tags:
       - role_specific
-  # DEPRECATED: the following options are deprecated and are currently maintained
-  # for backwards compatibility. They will be removed in the Queens cycle.
-  HostCpusList:
-    description: List of cores to be used for host process
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9,-]+"
-    default: '0'
-  NeutronDpdkCoreList:
-    description: List of cores to be used for DPDK Poll Mode Driver
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9,-]*"
-    default: ''
-  NeutronDpdkMemoryChannels:
-    description: Number of memory channels to be used for DPDK
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9]*"
-    default: ''
-  NeutronDpdkSocketMemory:
-    default: ''
-    description: Memory allocated for each socket
-    type: string
 
 conditions:
   is_host_config_required: {not: {equals: [{get_param: [RoleParameters, KernelArgs]}, ""]}}
@@ -143,10 +119,6 @@ conditions:
     or:
       - is_host_config_required
       - is_dpdk_config_required
-  l_cores_empty: {equals: [{get_param: OvsDpdkCoreList}, '']}
-  pmd_cores_empty: {equals: [{get_param: OvsPmdCoreList}, '']}
-  mem_channels_empty: {equals: [{get_param: OvsDpdkMemoryChannels}, '']}
-  socket_mem_empty: {equals: [{get_param: OvsDpdkSocketMemory}, '']}
   deployment_actions_empty:
     equals:
       - {get_param: deployment_actions}
@@ -166,10 +138,10 @@ resources:
               OvsPmdCoreList: OvsPmdCoreList
             - values: {get_param: [RoleParameters]}
           - values:
-              OvsDpdkCoreList: {if: [l_cores_empty, {get_param: HostCpusList}, {get_param: OvsDpdkCoreList}]}
-              OvsDpdkMemoryChannels: {if: [mem_channels_empty, {get_param: NeutronDpdkMemoryChannels}, {get_param: OvsDpdkMemoryChannels}]}
-              OvsDpdkSocketMemory: {if: [socket_mem_empty, {get_param: NeutronDpdkSocketMemory}, {get_param: OvsDpdkSocketMemory}]}
-              OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
+              OvsDpdkCoreList: {get_param: OvsDpdkCoreList}
+              OvsDpdkMemoryChannels: {get_param: OvsDpdkMemoryChannels}
+              OvsDpdkSocketMemory: {get_param: OvsDpdkSocketMemory}
+              OvsPmdCoreList: {get_param: OvsPmdCoreList}
 
   HostParametersConfig:
     type: OS::Heat::SoftwareConfig

puppet/services/openvswitch.yaml

@@ -83,51 +83,6 @@ parameters:
     default: ""
     tags:
       - role_specific
-  # DEPRECATED: the following options are deprecated and are currently maintained
-  # for backwards compatibility. They will be removed in the Queens cycle.
-  HostCpusList:
-    description: List of cores to be used for host process
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9,-]*"
-    default: ''
-  NeutronDpdkCoreList:
-    description: List of cores to be used for DPDK Poll Mode Driver
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9,-]*"
-    default: ''
-  NeutronDpdkMemoryChannels:
-    description: Number of memory channels to be used for DPDK
-    type: string
-    constraints:
-      - allowed_pattern: "[0-9]*"
-    default: ''
-  NeutronDpdkSocketMemory:
-    default: ''
-    description: Memory allocated for each socket
-    type: string
-  NeutronDpdkDriverType:
-    default: "vfio-pci"
-    description: DPDK Driver type
-    type: string
-
-parameter_groups:
-- label: deprecated
-  description: Do not use deprecated params, they will be removed.
-  parameters:
-    - HostCpusList
-    - NeutronDpdkCoreList
-    - NeutronDpdkMemoryChannels
-    - NeutronDpdkSocketMemory
-    - NeutronDpdkDriverType
-
-conditions:
-  l_cores_empty: {equals: [{get_param: OvsDpdkCoreList}, '']}
-  pmd_cores_empty: {equals: [{get_param: OvsPmdCoreList}, '']}
-  mem_channels_empty: {equals: [{get_param: OvsDpdkMemoryChannels}, '']}
-  socket_mem_empty: {equals: [{get_param: OvsDpdkSocketMemory}, '']}
-  driver_not_set: {equals: [{get_param: OvsDpdkDriverType}, 'vfio-pci']}
 
 outputs:
   role_data:
@@ -144,11 +99,11 @@ outputs:
               vswitch::dpdk::socket_mem: OvsDpdkSocketMemory
             - values: {get_param: [RoleParameters]}
           - values:
-              OvsDpdkCoreList: {if: [l_cores_empty, {get_param: HostCpusList}, {get_param: OvsDpdkCoreList}]}
-              OvsDpdkMemoryChannels: {if: [mem_channels_empty, {get_param: NeutronDpdkMemoryChannels}, {get_param: OvsDpdkMemoryChannels}]}
-              OvsDpdkSocketMemory: {if: [socket_mem_empty, {get_param: NeutronDpdkSocketMemory}, {get_param: OvsDpdkSocketMemory}]}
-              OvsDpdkDriverType: {if: [driver_not_set, {get_param: NeutronDpdkDriverType}, {get_param: OvsDpdkDriverType}]}
-              OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
+              OvsDpdkCoreList: {get_param: OvsDpdkCoreList}
+              OvsDpdkMemoryChannels: {get_param: OvsDpdkMemoryChannels}
+              OvsDpdkSocketMemory: {get_param: OvsDpdkSocketMemory}
+              OvsDpdkDriverType: {get_param: OvsDpdkDriverType}
+              OvsPmdCoreList: {get_param: OvsPmdCoreList}
 
       upgrade_tasks:
         - name: Check openvswitch version.

releasenotes/notes/ovs-dpdk-remove-deprecated-params-9b4e46eb336301b2.yaml

@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    Deprecated OVS-DPDK parameters (in pike) have been removed in rocky.
+    If the deployment still uses the removed parameters, use the alternate
+    parameters.
+    Use ``OvsDpdkCoreList`` instead of ``HostCpusList``.
+    Use ``OvsPmdCoreList`` instead of ``NeutronDpdkCoreList``.
+    Use ``OvsDpdkMemoryChannels`` instead of ``NeutronDpdkMemoryChannels``.
+    Use ``OvsDpdkSocketMemory`` instead of ``NeutronDpdkSocketMemory``.
+    Use ``OvsDpdkDriverType`` instead of ``NeutronDpdkDriverType``.

tools/yaml-validate.py

@@ -190,7 +190,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
                                    'SSLCertificate': ['description',
                                                       'default',
                                                       'hidden'],
-                                   'HostCpusList': ['default', 'constraints'],
                                    'NodeIndex': ['description'],
                                    'name': ['description', 'default'],
                                    'image': ['description', 'default'],