summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-08-30 13:35:43 +0300
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-08-30 13:39:52 +0300
commit7d02f4c328e1f712bb2bb3eee0d77593f22b2fba (patch)
tree0d8d4ea86e2f50978a159383327758415f7fa444
parent0db45e140467be234b76a424577d25d88dddda7d (diff)
Mend install script
* sed regexp & opt to edit a dpdk.conf * ovs-vsctl cmd errata Change-Id: I10e489a86aa8c4d3910e60bc68cae89e343bdd2d
Notes
Notes (review): Code-Review+1: Billy O'Mahony <billy.omahony@gmail.com> Code-Review+2: Michal Skalski <mskalski@mirantis.com> Workflow+1: Michal Skalski <mskalski@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 31 Aug 2016 13:02:46 +0000 Reviewed-on: https://review.openstack.org/362769 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/install.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index 0b8332a..471e066 100644
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -39,11 +39,11 @@ else
39 dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb 39 dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
40 40
41 dpdk_pages=$(($dpdk_socket_mem / 2)) 41 dpdk_pages=$(($dpdk_socket_mem / 2))
42 sed "s/#*\(NR_2M_PAGES=\).*/\1${dpdk_pages}/" /etc/dpdk/dpdk.conf 42 sed -i "s/[# ]*\(NR_2M_PAGES=\).*/\1${dpdk_pages}/" /etc/dpdk/dpdk.conf
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 ] && vs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem="$dpdk_socket_mem" 46 [ -n $dpdk_socket_mem ] && 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