diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-17 15:58:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-17 15:58:59 +0000 |
| commit | b411839804e6fca023ef7a695bbb616ea80fd6f3 (patch) | |
| tree | 4ff5708b37e36dfef879b762e91b9b9fae8e772b /build/ovs-dpdk-preconfig.yaml | |
| parent | 2f1a9dc491f55b5890a030a8ee36faa15de57b9e (diff) | |
| parent | 95ee731525170e8dd4df813d5ca7e43b0ba2f4eb (diff) | |
Merge "Adding yamllint to build checks"
Diffstat (limited to 'build/ovs-dpdk-preconfig.yaml')
| -rw-r--r-- | build/ovs-dpdk-preconfig.yaml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/ovs-dpdk-preconfig.yaml b/build/ovs-dpdk-preconfig.yaml index a4663ff3..91cd6e13 100644 --- a/build/ovs-dpdk-preconfig.yaml +++ b/build/ovs-dpdk-preconfig.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2014-10-16 description: > @@ -27,7 +28,7 @@ resources: OvsDpdkSetup: type: OS::Heat::StructuredDeployment properties: - server: {get_param: server} + server: {get_param: server} config: {get_resource: OvsDpdkConfig} OvsDpdkConfig: @@ -81,13 +82,16 @@ resources: sed -i "s/#group\s*=.*/group = \"root\"/" /etc/libvirt/qemu.conf ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true if [ -n "$SOCKET_MEMORY" ]; then - ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem=$SOCKET_MEMORY + other_config="dpdk-socket-mem=$SOCKET_MEMORY" + ovs-vsctl --no-wait set Open_vSwitch . other_config:$other_config fi - if [[ -n "$pmd_cpu_mask" && -n "$PMD_CORES" ]]; then - ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=$pmd_cpu_mask + if [ -n "$pmd_cpu_mask" ]; then + other_config="pmd-cpu-mask=$pmd_cpu_mask" + ovs-vsctl --no-wait set Open_vSwitch . other_config:$other_config fi - if [ -n "$dpdk_lcore_mask" && -n "$DPDK_CORES" ]]; then - ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-lcore-mask=$dpdk_lcore_mask + if [ -n "$dpdk_lcore_mask" ]; then + other_config="dpdk-lcore-mask=$dpdk_lcore_mask" + ovs-vsctl --no-wait set Open_vSwitch . other_config:$other_config fi systemctl restart openvswitch |