summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-31 06:39:23 +0000
committerGerrit Code Review <review@openstack.org>2016-05-31 06:39:23 +0000
commit6e3f8973df9ba87729f9f94bd45c937f46b942c7 (patch)
tree0c5f1b10e71fe23555b53a2f5d6d3c550595f4b9
parentbe8d32b422642e3945a7d92ceab7e72b337f9c44 (diff)
parent109c1678230fa46446ffde208ac51b22a8f5099b (diff)
Merge "Support non-dpdk/nsh support"
-rw-r--r--deployment_scripts/install.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index 7b1171f..e4b9489 100644
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -24,15 +24,17 @@ then
24 dpkg -i dpdk_2.2.0-1_amd64.deb 24 dpkg -i dpdk_2.2.0-1_amd64.deb
25 dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb 25 dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
26 fi 26 fi
27elif [ $dpdk = 'true' ] 27else
28then
29 wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/ 28 wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/
30 dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
31 dpkg -i libdpdk0_2.2.0-1_amd64.deb
32 dpkg -i dpdk_2.2.0-1_amd64.deb
33 dpkg -i openvswitch-datapath-dkms_2.5.1-1_all.deb 29 dpkg -i openvswitch-datapath-dkms_2.5.1-1_all.deb
34 dpkg -i openvswitch-common_2.5.1-1_amd64.deb 30 dpkg -i openvswitch-common_2.5.1-1_amd64.deb
35 dpkg -i openvswitch-switch_2.5.1-1_amd64.deb 31 dpkg -i openvswitch-switch_2.5.1-1_amd64.deb
36 dpkg -i python-openvswitch_2.5.1-1_all.deb 32 dpkg -i python-openvswitch_2.5.1-1_all.deb
37 dpkg -i openvswitch-switch-dpdk_2.5.1-1_amd64.deb 33 if [ $dpdk = 'true' ]
34 then
35 dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
36 dpkg -i libdpdk0_2.2.0-1_amd64.deb
37 dpkg -i dpdk_2.2.0-1_amd64.deb
38 dpkg -i openvswitch-switch-dpdk_2.5.1-1_amd64.deb
39 fi
38fi 40fi