summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-04-29 14:59:09 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-04-29 15:01:48 +0800
commitd5e302c26791ba27ea86abc02cdadd8bd3f3432d (patch)
tree1c00eb00cb716402c59d317044bca80e0098cd57
parentbca561ecd3121dcac0cb44f1b49092ab701a2835 (diff)
Install package by dpkg since fuel plugin don't support multi version
Change-Id: Id337d64e11de95c13519530bad284b28237ca455 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 29 Apr 2016 06:59:18 +0000 Reviewed-on: https://review.openstack.org/311040 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install-compute.pp6
-rwxr-xr-xrepositories/ubuntu/install.sh25
-rw-r--r--repositories/ubuntu/ovs-dpdk/.gitkeep0
-rw-r--r--repositories/ubuntu/ovs-nsh-dpdk/.gitkeep0
-rw-r--r--repositories/ubuntu/ovs-nsh/.gitkeep0
5 files changed, 28 insertions, 3 deletions
diff --git a/deployment_scripts/puppet/manifests/ovs-install-compute.pp b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
index 9b9301f..dae0659 100644
--- a/deployment_scripts/puppet/manifests/ovs-install-compute.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
@@ -3,17 +3,17 @@ if $operatingsystem == 'Ubuntu' {
3 if $fuel_settings['fuel-plugin-ovs']['support_nsh'] and 3 if $fuel_settings['fuel-plugin-ovs']['support_nsh'] and
4 $fuel_settings['fuel-plugin-ovs']['support_dpdk'] { 4 $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
5 exec { 'install ovs/nsh-dpdk': 5 exec { 'install ovs/nsh-dpdk':
6 command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.nshdpdk-1 openvswitch-common_2.4.90.nshdpdk-1 openvswitch-switch_2.4.90.nshdpdk-1' 6 command => '/usr/bin/curl http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/install.sh | /bin/bash -s nshdpdk'
7 } 7 }
8 } 8 }
9 elsif $fuel_settings['fuel-plugin-ovs']['support_dpdk'] { 9 elsif $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
10 exec { 'install ovs/dpdk': 10 exec { 'install ovs/dpdk':
11 command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.dpdk-1 openvswitch-common_2.4.90.dpdk-1 openvswitch-switch_2.4.90.dpdk-1' 11 command => '/usr/bin/curl http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/install.sh | /bin/bash -s dpdk'
12 } 12 }
13 } 13 }
14 elsif $fuel_settings['fuel-plugin-ovs']['support_nsh'] { 14 elsif $fuel_settings['fuel-plugin-ovs']['support_nsh'] {
15 exec { 'install ovs/nsh': 15 exec { 'install ovs/nsh':
16 command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.nsh-1 openvswitch-common_2.4.90.nsh-1 openvswitch-switch_2.4.90.nsh-1' 16 command => '/usr/bin/curl http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/install.sh | /bin/bash -s nsh'
17 } 17 }
18 } 18 }
19 19
diff --git a/repositories/ubuntu/install.sh b/repositories/ubuntu/install.sh
new file mode 100755
index 0000000..5630609
--- /dev/null
+++ b/repositories/ubuntu/install.sh
@@ -0,0 +1,25 @@
1#!/bin/bash
2set -eux
3
4INSTALL_HOME=/tmp/ovs-nshdpdk
5rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
6cd $INSTALL_HOME
7
8wget -r -nd -np http://10.20.0.2:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu
9
10if [ $1 = 'nshdpdk' ]
11then
12 dpkg -i openvswitch-datapath-dkms_2.4.90.nshdpdk-1_all.deb
13 dpkg -i openvswitch-common_2.4.90.nshdpdk-1_amd64.deb
14 dpkg -i openvswitch-switch_2.4.90.nshdpdk-1_amd64.deb
15elif [ $1 = 'nsh' ]
16then
17 dpkg -i openvswitch-datapath-dkms_2.4.90.nsh-1_all.deb
18 dpkg -i openvswitch-common_2.4.90.nsh-1_amd64.deb
19 dpkg -i openvswitch-switch_2.4.90.nsh-1_amd64.deb
20elif [ $1 = 'dpdk' ]
21then
22 dpkg -i openvswitch-datapath-dkms_2.4.90.dpdk-1_all.deb
23 dpkg -i openvswitch-common_2.4.90.dpdk-1_amd64.deb
24 dpkg -i openvswitch-switch_2.4.90.dpdk-1_amd64.deb
25fi
diff --git a/repositories/ubuntu/ovs-dpdk/.gitkeep b/repositories/ubuntu/ovs-dpdk/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/repositories/ubuntu/ovs-dpdk/.gitkeep
+++ /dev/null
diff --git a/repositories/ubuntu/ovs-nsh-dpdk/.gitkeep b/repositories/ubuntu/ovs-nsh-dpdk/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/repositories/ubuntu/ovs-nsh-dpdk/.gitkeep
+++ /dev/null
diff --git a/repositories/ubuntu/ovs-nsh/.gitkeep b/repositories/ubuntu/ovs-nsh/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/repositories/ubuntu/ovs-nsh/.gitkeep
+++ /dev/null