Rebase to fuel 10.0
Change-Id: I110a8b3626bcb3ac64c7f2b489755a9fbb4669ff Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
This commit is contained in:
parent
019344248d
commit
996c928d42
@ -12,7 +12,7 @@ dpdk_socket_mem=${4:-''}
|
|||||||
|
|
||||||
if [ $nsh = 'true' ]
|
if [ $nsh = 'true' ]
|
||||||
then
|
then
|
||||||
curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
|
curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
|
||||||
dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb
|
dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb
|
||||||
dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb
|
dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb
|
||||||
dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb
|
dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb
|
||||||
@ -25,7 +25,7 @@ then
|
|||||||
dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb
|
dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv
|
curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv
|
||||||
dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
|
dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
|
||||||
dpkg -i openvswitch-common_2.5.90-1_amd64.deb
|
dpkg -i openvswitch-common_2.5.90-1_amd64.deb
|
||||||
dpkg -i openvswitch-switch_2.5.90-1_amd64.deb
|
dpkg -i openvswitch-switch_2.5.90-1_amd64.deb
|
||||||
|
@ -3,15 +3,15 @@ name: fuel-plugin-ovs
|
|||||||
# Human-readable name for your plugin
|
# Human-readable name for your plugin
|
||||||
title: Install Openvswitch with NSH/DPDK
|
title: Install Openvswitch with NSH/DPDK
|
||||||
# Plugin version
|
# Plugin version
|
||||||
version: '0.9.0'
|
version: '1.0.0'
|
||||||
# Description
|
# Description
|
||||||
description: 'This plugin provides to deploy openvswitch with NSH/DPDK'
|
description: 'This plugin provides to deploy openvswitch with NSH/DPDK'
|
||||||
# Required fuel version
|
# Required fuel version
|
||||||
fuel_version: ['9.0']
|
fuel_version: ['10.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
|
||||||
authors: ['ling.y.yu@intel.com','ruijing.guo@intel.com']
|
authors: ['ruijing.guo@intel.com']
|
||||||
# A link to the plugin's page
|
# A link to the plugin's page
|
||||||
homepage: 'https://github.com/openstack/fuel-plugin-ovs'
|
homepage: 'https://github.com/openstack/fuel-plugin-ovs'
|
||||||
# Specify a group which your plugin implements, possible options:
|
# Specify a group which your plugin implements, possible options:
|
||||||
@ -21,7 +21,7 @@ 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: mitaka-9.0
|
version: newton-10.0
|
||||||
mode: ['ha']
|
mode: ['ha']
|
||||||
deployment_scripts_path: deployment_scripts/
|
deployment_scripts_path: deployment_scripts/
|
||||||
repository_path: repositories/ubuntu
|
repository_path: repositories/ubuntu
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
FROM ubuntu:14.04.3
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
RUN apt-get update -y
|
RUN apt-get update -y
|
||||||
|
RUN apt-get install -y sudo
|
||||||
RUN rm -rf /lib/modules
|
RUN rm -rf /lib/modules
|
||||||
RUN apt-get install -y linux-headers-3.13.0-86-generic
|
RUN apt-get install -y linux-headers-4.4.0-45-generic
|
||||||
RUN ln -s /lib/modules/3.13.0-86-generic /lib/modules/`uname -r`
|
RUN ln -s /lib/modules/4.4.0-45-generic /lib/modules/`uname -r`
|
||||||
|
|
||||||
ADD ./ /ovs_build
|
ADD ./ /ovs_build
|
||||||
|
4
vagrant/Vagrantfile
vendored
4
vagrant/Vagrantfile
vendored
@ -6,8 +6,7 @@ VAGRANTFILE_API_VERSION = "2"
|
|||||||
|
|
||||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
|
|
||||||
config.vm.box = "trusty-server-cloudimg-amd64"
|
config.vm.box = "bento/ubuntu-16.04"
|
||||||
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
|
|
||||||
|
|
||||||
config.vm.define "fuel" do | h |
|
config.vm.define "fuel" do | h |
|
||||||
h.vm.host_name = "fuel"
|
h.vm.host_name = "fuel"
|
||||||
@ -16,6 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||||||
h.vm.provider :virtualbox do |v|
|
h.vm.provider :virtualbox do |v|
|
||||||
v.customize ["modifyvm", :id, "--memory", 4096]
|
v.customize ["modifyvm", :id, "--memory", 4096]
|
||||||
v.customize ["modifyvm", :id, "--cpus", 4]
|
v.customize ["modifyvm", :id, "--cpus", 4]
|
||||||
|
v.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user