Merge "Provide option to disable EMC in puppet-vswitch"

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -105,6 +105,13 @@ parameters:
     type: boolean
     tags:
       - role_specific
+  OvsDisableEMC:
+    default: false
+    description: |
+      Disable OVS Exact Match Cache.
+    type: boolean
+    tags:
+      - role_specific
   NeutronOVSTunnelCsum:
     default: false
     description: |
@@ -137,10 +144,12 @@ resources:
           - map_replace:
             - neutron::agents::ml2::ovs::bridge_mappings: NeutronBridgeMappings
               vswitch::ovs::enable_hw_offload: OvsHwOffload
+              vswitch::ovs::disable_emc: OvsDisableEMC
             - values: {get_param: [RoleParameters]}
           - values:
               NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
               OvsHwOffload: {get_param: OvsHwOffload}
+              OvsDisableEMC: {get_param: OvsDisableEMC}
 
   NeutronBase:
     type: ../../puppet/services/neutron-base.yaml

puppet/services/openvswitch.yaml

@@ -83,6 +83,13 @@ parameters:
     default: ""
     tags:
       - role_specific
+  OvsDisableEMC:
+    default: false
+    description: |
+      Disable OVS Exact Match Cache.
+    type: boolean
+    tags:
+      - role_specific
 
 outputs:
   role_data:
@@ -97,6 +104,7 @@ outputs:
               vswitch::dpdk::pmd_core_list: OvsPmdCoreList
               vswitch::dpdk::memory_channels: OvsDpdkMemoryChannels
               vswitch::dpdk::socket_mem: OvsDpdkSocketMemory
+              vswitch::dpdk::disable_emc: OvsDisableEMC
             - values: {get_param: [RoleParameters]}
           - values:
               OvsDpdkCoreList: {get_param: OvsDpdkCoreList}
@@ -104,3 +112,4 @@ outputs:
               OvsDpdkSocketMemory: {get_param: OvsDpdkSocketMemory}
               OvsDpdkDriverType: {get_param: OvsDpdkDriverType}
               OvsPmdCoreList: {get_param: OvsPmdCoreList}
+              OvsDisableEMC: {get_param: OvsDisableEMC}

releasenotes/notes/OvsDisableEMC-ab29e5c08856d439.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Added the configuration option to disable Exact Match Cache (EMC)