summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlingyu1 <ling.y.yu@intel.com>2016-01-26 01:25:39 +0800
committerlingyu1 <ling.y.yu@intel.com>2016-01-26 01:26:13 +0800
commit12217be079aae7b2c48a89603d495650526229ce (patch)
tree55a3c522a3317764fc322a38f7b5ebf73806001d
parent3776734a7b93ac440aa7b2e730d743b8510aac25 (diff)
Rebase to 8.0
Change-Id: Ie7227b6bfe3b4adcdfebf5b92008f4e90d653882 Signed-off-by: lingyu1 <ling.y.yu@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: Tue, 26 Jan 2016 00:50:05 +0000 Reviewed-on: https://review.openstack.org/271961 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--metadata.yaml8
-rw-r--r--ovs-nsh/Dockerfile4
2 files changed, 6 insertions, 6 deletions
diff --git a/metadata.yaml b/metadata.yaml
index aba3d3b..333c46c 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,11 +3,11 @@ name: fuel-plugin-ovs
3# Human-readable name for your plugin 3# Human-readable name for your plugin
4title: Openvswitch with NSH support 4title: Openvswitch with NSH support
5# Plugin version 5# Plugin version
6version: '0.5.1' 6version: '0.5.2'
7# Description 7# Description
8description: 'This plugin provides to deploy openvswitch with nsh' 8description: 'This plugin provides to deploy openvswitch with nsh'
9# Required fuel version 9# Required fuel version
10fuel_version: ['7.0'] 10fuel_version: ['8.0']
11# Specify license of your plugin 11# Specify license of your plugin
12licenses: ['Apache License Version 2.0'] 12licenses: ['Apache License Version 2.0']
13# Specify author or company name 13# Specify author or company name
@@ -21,8 +21,8 @@ groups: ['network']
21# The plugin is compatible with releases in the list 21# The plugin is compatible with releases in the list
22releases: 22releases:
23 - os: ubuntu 23 - os: ubuntu
24 version: 2015.1.0-7.0 24 version: liberty-8.0
25 mode: ['ha', 'multinode'] 25 mode: ['ha']
26 deployment_scripts_path: deployment_scripts/ 26 deployment_scripts_path: deployment_scripts/
27 repository_path: repositories/ubuntu 27 repository_path: repositories/ubuntu
28 28
diff --git a/ovs-nsh/Dockerfile b/ovs-nsh/Dockerfile
index 536c830..9d23652 100644
--- a/ovs-nsh/Dockerfile
+++ b/ovs-nsh/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update
7RUN apt-get install -y software-properties-common python-software-properties \ 7RUN apt-get install -y software-properties-common python-software-properties \
8 make python-setuptools python-all dpkg-dev debhelper \ 8 make python-setuptools python-all dpkg-dev debhelper \
9 fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \ 9 fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
10 ca-certificates sudo apt-utils lsb-release libtool autoconf automake build-essential fakeroot libssl-dev graphviz dh-autoreconf python-qt4 python-twisted-conch python-zopeinterface linux-headers-3.13.0-74-generic 10 ca-certificates sudo apt-utils lsb-release libtool autoconf automake build-essential fakeroot libssl-dev graphviz dh-autoreconf python-qt4 python-twisted-conch python-zopeinterface linux-headers-3.13.0-76-generic
11 11
12RUN ln -s /lib/modules/3.13.0-74-generic /lib/modules/`uname -r` 12RUN ln -s /lib/modules/3.13.0-76-generic /lib/modules/`uname -r`
13 13
14RUN apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev 14RUN apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev
15 15