From 30a55e6318d11150869bd6ae01e2ea6191004363 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 28 Apr 2017 10:26:35 -0400 Subject: Fixes bugs in ovs dpdk Changes Include: - Fixes an issue where using non-1st nic admin network deployment would result in loss of network connectivity during deployment. - Fixes an issue where not specifying cores to pin to in performance options would result in an incorrect '0' value used for core mask. JIRA: APEX-452 JIRA: APEX-453 Change-Id: I413290161abd9b2fa39b659d5ff989da9554f603 Signed-off-by: Tim Rozet (cherry picked from commit c9bde98a9729dbc442ce8c0cdbc29c7d35167db6) --- build/first-boot.yaml | 2 +- build/ovs-dpdk-preconfig.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/first-boot.yaml b/build/first-boot.yaml index 6cd874cc..d4ac5df6 100644 --- a/build/first-boot.yaml +++ b/build/first-boot.yaml @@ -39,7 +39,7 @@ resources: echo vm.hugetlb_shm_group=0 >> /usr/lib/sysctl.d/00-system.conf echo vm.max_map_count=$(printf "%.0f" $(echo 2.2*$hugepage_count | bc)) >> /usr/lib/sysctl.d/00-system.conf echo kernel.shmmax=$(($hugepage_count * 2 * 1024 * 1024)) >> /usr/lib/sysctl.d/00-system.conf - + rm -f /etc/sysconfig/network-scripts/ifcfg-* reboot params: $KERNEL_ARGS: {get_param: ComputeKernelArgs} diff --git a/build/ovs-dpdk-preconfig.yaml b/build/ovs-dpdk-preconfig.yaml index d57b0b7a..a4663ff3 100644 --- a/build/ovs-dpdk-preconfig.yaml +++ b/build/ovs-dpdk-preconfig.yaml @@ -83,10 +83,10 @@ resources: if [ -n "$SOCKET_MEMORY" ]; then ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem=$SOCKET_MEMORY fi - if [ -n "$pmd_cpu_mask" ]; then + if [[ -n "$pmd_cpu_mask" && -n "$PMD_CORES" ]]; then ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=$pmd_cpu_mask fi - if [ -n "$dpdk_lcore_mask" ]; then + if [ -n "$dpdk_lcore_mask" && -n "$DPDK_CORES" ]]; then ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-lcore-mask=$dpdk_lcore_mask fi systemctl restart openvswitch -- cgit 1.2.3-korg