diff options
author | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-05-07 07:53:55 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-05-07 07:53:55 +0000 |
commit | dcd856239816dc322c917e639bf11213ede7467d (patch) | |
tree | b6a146af474deae24364caaecc67cc8c9c498147 /mcp/patches | |
parent | 6fc9ea86375b3fafba3de494ba32a4c65f39ca93 (diff) | |
parent | 90480f70cf3d287e82830a1df157a0066807a3c9 (diff) |
Merge "[dpdk] Get back to shared memory model"
Diffstat (limited to 'mcp/patches')
-rw-r--r-- | mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch (renamed from mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch b/mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch index 4a35a8a79..b54650007 100644 --- a/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch +++ b/mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch @@ -7,19 +7,19 @@ : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Michael Polenchuk <mpolenchuk@mirantis.com> -Date: Mon, 1 Apr 2019 13:09:37 +0400 -Subject: [PATCH] [dpdk] Enable per port memory model +Date: Tue, 30 Apr 2019 12:59:54 +0400 +Subject: [PATCH] [dpdk] Handle per port memory model diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls -index 786f7c8..48c00f5 100644 +index 786f7c8..c6f3020 100644 --- a/linux/network/dpdk.sls +++ b/linux/network/dpdk.sls @@ -49,6 +49,7 @@ linux_network_dpdk_ovs_service: - unless: 'ovs-vsctl get Open_vSwitch . other_config | grep "dpdk-init=\"true\""' - + {%- set ovs_options = [ -+ 'per-port-memory="true"', ++ 'per-port-memory="'+network.openvswitch.per_port_memory|d('false')+'"', "pmd-cpu-mask=\""+network.openvswitch.pmd_cpu_mask+"\"", "dpdk-socket-mem=\""+network.openvswitch.dpdk_socket_mem+"\"", "dpdk-lcore-mask=\""+network.openvswitch.dpdk_lcore_mask+"\"", |