Rebase to 8.0

Change-Id: Ie7227b6bfe3b4adcdfebf5b92008f4e90d653882
Signed-off-by: lingyu1 <ling.y.yu@intel.com>
This commit is contained in:
lingyu1 2016-01-26 01:25:39 +08:00
parent 3776734a7b
commit 12217be079
2 changed files with 6 additions and 6 deletions

View File

@ -3,11 +3,11 @@ name: fuel-plugin-ovs
# Human-readable name for your plugin # Human-readable name for your plugin
title: Openvswitch with NSH support title: Openvswitch with NSH support
# Plugin version # Plugin version
version: '0.5.1' version: '0.5.2'
# Description # Description
description: 'This plugin provides to deploy openvswitch with nsh' description: 'This plugin provides to deploy openvswitch with nsh'
# Required fuel version # Required fuel version
fuel_version: ['7.0'] fuel_version: ['8.0']
# Specify license of your plugin # Specify license of your plugin
licenses: ['Apache License Version 2.0'] licenses: ['Apache License Version 2.0']
# Specify author or company name # Specify author or company name
@ -21,8 +21,8 @@ groups: ['network']
# The plugin is compatible with releases in the list # The plugin is compatible with releases in the list
releases: releases:
- os: ubuntu - os: ubuntu
version: 2015.1.0-7.0 version: liberty-8.0
mode: ['ha', 'multinode'] mode: ['ha']
deployment_scripts_path: deployment_scripts/ deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu repository_path: repositories/ubuntu

View File

@ -7,9 +7,9 @@ RUN apt-get update
RUN apt-get install -y software-properties-common python-software-properties \ RUN apt-get install -y software-properties-common python-software-properties \
make python-setuptools python-all dpkg-dev debhelper \ make python-setuptools python-all dpkg-dev debhelper \
fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \ fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
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 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
RUN ln -s /lib/modules/3.13.0-74-generic /lib/modules/`uname -r` RUN ln -s /lib/modules/3.13.0-76-generic /lib/modules/`uname -r`
RUN apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev RUN apt-get install -y pkg-config unzip liblua5.2-dev libpcap-dev libedit-dev libncurses5-dev libncursesw5-dev