summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-03-14 00:33:18 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2017-03-14 00:34:19 +0800
commita77ce892047fe1ca257bd199d0abf2d2a046c8a3 (patch)
treee32b471ab70841531150b6e9f460c3e01cd7a8a3
parent24b1dd4464f6b86d73b15a4b3f0984a2d597750f (diff)
Remove OVS with DPDK in metadata10.0-eol
Change-Id: Idb34b9af86d7f8fe49d93e7137dd505dbf7f7bbb Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+1: Alexandru Avadanii <alexandru.avadanii@enea.com> Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 14 Mar 2017 02:57:35 +0000 Reviewed-on: https://review.openstack.org/445256 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--README.md2
-rwxr-xr-xdeployment_scripts/install.sh22
-rw-r--r--metadata.yaml4
3 files changed, 9 insertions, 19 deletions
diff --git a/README.md b/README.md
index 37f17c2..660fc1f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Openvswitch plugin
7Overview 7Overview
8-------- 8--------
9 9
10Fuel plugin fuel-plugin-ovs is developed to deploy OVS with NSH or OVS with DPDK 10Fuel plugin fuel-plugin-ovs is developed to deploy OVS with NSH
11 11
12Requirements 12Requirements
13------------ 13------------
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index ca87e94..3c941a1 100755
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -7,26 +7,16 @@ cd $INSTALL_HOME
7 7
8host=$1 8host=$1
9nsh=$2 9nsh=$2
10dpdk=$3
11deb_arch=$(dpkg --print-architecture) 10deb_arch=$(dpkg --print-architecture)
12 11
13ovs="ovs-dpdk_${deb_arch}.tar.gz"
14if [ $nsh = 'true' ]; then 12if [ $nsh = 'true' ]; then
15 ovs="ovs-nsh_${deb_arch}.tar.gz" 13 ovs="ovs-nsh_${deb_arch}.tar.gz"
16fi 14 apt-get install -y --allow-unauthenticated dkms
17 15 curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/${ovs} | tar -xzv
18apt-get install -y --allow-unauthenticated dkms 16 dpkg -i openvswitch-datapath-dkms_*.deb
19 17 dpkg -i openvswitch-common_*.deb
20curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/${ovs} | tar -xzv 18 dpkg -i openvswitch-switch_*.deb
21dpkg -i openvswitch-datapath-dkms_*.deb 19 dpkg -i python-openvswitch_*.deb
22dpkg -i openvswitch-common_*.deb
23dpkg -i openvswitch-switch_*.deb
24dpkg -i python-openvswitch_*.deb
25
26if [ $dpdk = 'true' ]
27then
28 apt-get install -y --allow-unauthenticated dpdk dpdk-dev dpdk-dkms
29 dpkg -i openvswitch-switch-dpdk_*.deb
30fi 20fi
31 21
32rm -rf $INSTALL_HOME 22rm -rf $INSTALL_HOME
diff --git a/metadata.yaml b/metadata.yaml
index 0997d78..d0a1c9a 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,11 +1,11 @@
1# Plugin name 1# Plugin name
2name: fuel-plugin-ovs 2name: fuel-plugin-ovs
3# Human-readable name for your plugin 3# Human-readable name for your plugin
4title: Install Open vSwitch with NSH or Open vSwitch with DPDK 4title: Install Open vSwitch with NSH
5# Plugin version 5# Plugin version
6version: '1.0.0' 6version: '1.0.0'
7# Description 7# Description
8description: 'This plugin provides to deploy Open vSwitch with NSH or Open vSwitch with DPDK' 8description: 'This plugin provides to deploy Open vSwitch with NSH'
9# Required fuel version 9# Required fuel version
10fuel_version: ['10.0'] 10fuel_version: ['10.0']
11# Specify license of your plugin 11# Specify license of your plugin