diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-03 02:58:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-03 02:58:57 +0000 |
| commit | d7cd79b099f71d5f1d46498222d9bb0c7cbdcc6a (patch) | |
| tree | 12f7498c4ce00671651c4250260aa90ffcea22c7 | |
| parent | d94215f00bafd38466e3eaa7d2724bb8c42e0fe3 (diff) | |
| parent | 30a55e6318d11150869bd6ae01e2ea6191004363 (diff) | |
Merge "Fixes bugs in ovs dpdk" into stable/danube
| -rw-r--r-- | build/first-boot.yaml | 2 | ||||
| -rw-r--r-- | 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 |