Provide option to disable EMC in puppet-vswitch
This patch disables EMC by setting emc-insert-inv-prob to 0.
Conflicts:
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
Depends-On: https://review.openstack.org/647955
Change-Id: I36bc91064df224cfdaf01fb38e74ee8a9e4bf407
(cherry picked from commit dbe516df0a
)
This commit is contained in:
parent
bf87c099c9
commit
9ddef71067
|
@ -83,6 +83,13 @@ parameters:
|
||||||
description: |
|
description: |
|
||||||
Enable OVS Hardware Offload. This feature supported from OVS 2.8.0
|
Enable OVS Hardware Offload. This feature supported from OVS 2.8.0
|
||||||
type: boolean
|
type: boolean
|
||||||
|
OvsDisableEMC:
|
||||||
|
default: false
|
||||||
|
description: |
|
||||||
|
Disable OVS Exact Match Cache.
|
||||||
|
type: boolean
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
NeutronOVSTunnelCsum:
|
NeutronOVSTunnelCsum:
|
||||||
default: false
|
default: false
|
||||||
description: |
|
description: |
|
||||||
|
@ -124,10 +131,12 @@ resources:
|
||||||
- map_replace:
|
- map_replace:
|
||||||
- neutron::agents::ml2::ovs::bridge_mappings: NeutronBridgeMappings
|
- neutron::agents::ml2::ovs::bridge_mappings: NeutronBridgeMappings
|
||||||
vswitch::ovs::enable_hw_offload: OvsHwOffload
|
vswitch::ovs::enable_hw_offload: OvsHwOffload
|
||||||
|
vswitch::ovs::disable_emc: OvsDisableEMC
|
||||||
- values: {get_param: [RoleParameters]}
|
- values: {get_param: [RoleParameters]}
|
||||||
- values:
|
- values:
|
||||||
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
||||||
OvsHwOffload: {get_param: OvsHwOffload}
|
OvsHwOffload: {get_param: OvsHwOffload}
|
||||||
|
OvsDisableEMC: {get_param: OvsDisableEMC}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
|
|
@ -83,6 +83,13 @@ parameters:
|
||||||
default: ""
|
default: ""
|
||||||
tags:
|
tags:
|
||||||
- role_specific
|
- role_specific
|
||||||
|
OvsDisableEMC:
|
||||||
|
default: false
|
||||||
|
description: |
|
||||||
|
Disable OVS Exact Match Cache.
|
||||||
|
type: boolean
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
# DEPRECATED: the following options are deprecated and are currently maintained
|
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||||
# for backwards compatibility. They will be removed in the Queens cycle.
|
# for backwards compatibility. They will be removed in the Queens cycle.
|
||||||
HostCpusList:
|
HostCpusList:
|
||||||
|
@ -142,6 +149,7 @@ outputs:
|
||||||
vswitch::dpdk::pmd_core_list: OvsPmdCoreList
|
vswitch::dpdk::pmd_core_list: OvsPmdCoreList
|
||||||
vswitch::dpdk::memory_channels: OvsDpdkMemoryChannels
|
vswitch::dpdk::memory_channels: OvsDpdkMemoryChannels
|
||||||
vswitch::dpdk::socket_mem: OvsDpdkSocketMemory
|
vswitch::dpdk::socket_mem: OvsDpdkSocketMemory
|
||||||
|
vswitch::dpdk::disable_emc: OvsDisableEMC
|
||||||
- values: {get_param: [RoleParameters]}
|
- values: {get_param: [RoleParameters]}
|
||||||
- values:
|
- values:
|
||||||
OvsDpdkCoreList: {if: [l_cores_empty, {get_param: HostCpusList}, {get_param: OvsDpdkCoreList}]}
|
OvsDpdkCoreList: {if: [l_cores_empty, {get_param: HostCpusList}, {get_param: OvsDpdkCoreList}]}
|
||||||
|
@ -149,6 +157,7 @@ outputs:
|
||||||
OvsDpdkSocketMemory: {if: [socket_mem_empty, {get_param: NeutronDpdkSocketMemory}, {get_param: OvsDpdkSocketMemory}]}
|
OvsDpdkSocketMemory: {if: [socket_mem_empty, {get_param: NeutronDpdkSocketMemory}, {get_param: OvsDpdkSocketMemory}]}
|
||||||
OvsDpdkDriverType: {if: [driver_not_set, {get_param: NeutronDpdkDriverType}, {get_param: OvsDpdkDriverType}]}
|
OvsDpdkDriverType: {if: [driver_not_set, {get_param: NeutronDpdkDriverType}, {get_param: OvsDpdkDriverType}]}
|
||||||
OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
|
OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
|
||||||
|
OvsDisableEMC: {get_param: OvsDisableEMC}
|
||||||
|
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
- name: Check openvswitch version.
|
- name: Check openvswitch version.
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- Added the configuration option to disable Exact Match Cache (EMC)
|
Loading…
Reference in New Issue