summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-04-28 16:36:48 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-04-28 16:37:18 +0800
commitbca561ecd3121dcac0cb44f1b49092ab701a2835 (patch)
tree9042b831af8c2063d8089fc5c005254f1e17d935
parenta75938a203fe0eeff5d32871a75cd422a1b31db1 (diff)
support fuel 9.0
Change-Id: Ib30f429f7db8cc3503f94a4e6d4505ca7e0f542e 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: Thu, 28 Apr 2016 08:34:33 +0000 Reviewed-on: https://review.openstack.org/310697 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--README.md4
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install-compute.pp25
-rw-r--r--environment_config.yaml5
-rw-r--r--metadata.yaml12
4 files changed, 24 insertions, 22 deletions
diff --git a/README.md b/README.md
index c5e36db..44352be 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Requirements
14 14
15| Requirement | Version/Comment | 15| Requirement | Version/Comment |
16|----------------------------------|-----------------| 16|----------------------------------|-----------------|
17| Mirantis OpenStack compatibility | 8.0 | 17| Mirantis OpenStack compatibility | 9.0 |
18 18
19Recommendations 19Recommendations
20--------------- 20---------------
@@ -60,7 +60,7 @@ Openvswitch plugin installation
60 60
61 id | name | version | package_version 61 id | name | version | package_version
62 ---|-----------------|---------|---------------- 62 ---|-----------------|---------|----------------
63 1 | fuel-plugin-ovs | 0.8.0 | 3.0.0 63 1 | fuel-plugin-ovs | 0.9.0 | 4.0.0
64 64
658. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI. 658. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
66 66
diff --git a/deployment_scripts/puppet/manifests/ovs-install-compute.pp b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
index b29deee..9b9301f 100644
--- a/deployment_scripts/puppet/manifests/ovs-install-compute.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
@@ -1,16 +1,21 @@
1$fuel_settings = parseyaml(file('/etc/compute.yaml')) 1$fuel_settings = parseyaml(file('/etc/astute.yaml'))
2if $operatingsystem == 'Ubuntu' { 2if $operatingsystem == 'Ubuntu' {
3 if $fuel_settings['fuel-plugin-ovs']['support_dpdk'] { 3 if $fuel_settings['fuel-plugin-ovs']['support_nsh'] and
4 $packages='openvswitch-datapath-dkms_2.4.90.dpdk-1 openvswitch-common_2.4.90.dpdk-1 openvswitch-switch_2.4.90.dpdk-1' 4 $fuel_settings['fuel-plugin-ovs']['support_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'
7 }
5 } 8 }
6 if $fuel_settings['fuel-plugin-ovs']['support_nsh'] { 9 elsif $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
7 $packages='openvswitch-datapath-dkms_2.4.90.nsh-1 openvswitch-common_2.4.90.nsh-1 openvswitch-switch_2.4.90.nsh-1' 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'
12 }
8 } 13 }
9 if $fuel_settings['fuel-plugin-ovs']['support_nsh_dpdk'] { 14 elsif $fuel_settings['fuel-plugin-ovs']['support_nsh'] {
10 $packages='openvswitch-datapath-dkms_2.4.90.nshdpdk-1 openvswitch-common_2.4.90.nshdpdk-1 openvswitch-switch_2.4.90.nshdpdk-1' 15 exec { 'install ovs/nsh':
11 } 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'
12 exec { 'ovs install': 17 }
13 command => '/usr/bin/apt-get -y --force-yes install $packages'
14 } 18 }
19
15} elsif $operatingsystem == 'CentOS' { 20} elsif $operatingsystem == 'CentOS' {
16} 21}
diff --git a/environment_config.yaml b/environment_config.yaml
index ac4b617..04a3fda 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -9,8 +9,3 @@ attributes:
9 weight: 20 9 weight: 20
10 value: false 10 value: false
11 label: "support NSH" 11 label: "support NSH"
12 support_nsh_dpdk:
13 type: "checkbox"
14 weight: 20
15 value: false
16 label: "support NSH & DPDK"
diff --git a/metadata.yaml b/metadata.yaml
index bec0dcb..b8f5edf 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/DPDK support 4title: Openvswitch with NSH/DPDK support
5# Plugin version 5# Plugin version
6version: '0.8.0' 6version: '0.9.0'
7# Description 7# Description
8description: 'This plugin provides to deploy openvswitch with nsh' 8description: 'This plugin provides to deploy openvswitch with NSH/DPDK'
9# Required fuel version 9# Required fuel version
10fuel_version: ['8.0'] 10fuel_version: ['9.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,10 +21,12 @@ 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: liberty-8.0 24 version: mitaka-9.0
25 mode: ['ha'] 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
29# Version of plugin package 29# Version of plugin package
30package_version: '3.0.0' 30package_version: '4.0.0'
31
32is_hotpluggable: false