summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-09-01 12:38:45 +0300
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-09-01 12:49:21 +0300
commit137748b828f03debe5ae1b40a4ee440b8f5e96f8 (patch)
tree1c02f3d1fb21bc0835c1219999d1cd623e52e8be
parent7d02f4c328e1f712bb2bb3eee0d77593f22b2fba (diff)
Set default for dpdk_socket_mem
To avoid unbound variable assign set empty value as a default. Change-Id: If3b7c3bcab6b18d4913db3b81f0269cb73ef894a
Notes
Notes (review): Code-Review+2: Michal Skalski <mskalski@mirantis.com> Workflow+1: Michal Skalski <mskalski@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 01 Sep 2016 13:12:54 +0000 Reviewed-on: https://review.openstack.org/364200 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/install.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index 471e066..60b351c 100644
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -8,7 +8,7 @@ cd $INSTALL_HOME
8host=$1 8host=$1
9nsh=$2 9nsh=$2
10dpdk=$3 10dpdk=$3
11dpdk_socket_mem=$4 11dpdk_socket_mem=${4:-''}
12 12
13 13
14if [ $nsh = 'true' ] 14if [ $nsh = 'true' ]
@@ -31,7 +31,7 @@ else
31 dpkg -i openvswitch-common_2.5.90-1_amd64.deb 31 dpkg -i openvswitch-common_2.5.90-1_amd64.deb
32 dpkg -i openvswitch-switch_2.5.90-1_amd64.deb 32 dpkg -i openvswitch-switch_2.5.90-1_amd64.deb
33 dpkg -i python-openvswitch_2.5.90-1_all.deb 33 dpkg -i python-openvswitch_2.5.90-1_all.deb
34 if [ $dpdk = 'true' ] 34 if [[ $dpdk = 'true' && -n $dpdk_socket_mem ]]
35 then 35 then
36 dpkg -i libxenstore3.0*.deb 36 dpkg -i libxenstore3.0*.deb
37 dpkg -i libdpdk0_16.07-1_amd64.deb 37 dpkg -i libdpdk0_16.07-1_amd64.deb
@@ -43,7 +43,7 @@ else
43 service dpdk start 43 service dpdk start
44 44
45 ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true 45 ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true
46 [ -n $dpdk_socket_mem ] && ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem="$dpdk_socket_mem" 46 ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem="$dpdk_socket_mem"
47 47
48 service openvswitch-switch restart 48 service openvswitch-switch restart
49 fi 49 fi