Merge "[dpdk] Get back to shared memory model"

3 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+"\"",
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 39baa623d525cd9a7eaedb5661e6b6730f0311b
+Subproject 6176bde8f5a5e3b723149830242ada46c5126e3
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
-Subproject 4fd183a336dd1047f0468ae2699860c67116c2b
+Subproject fed789498ee2d7b4a910c881331013d30ef623b