Browse Source

support fuel 9.0

Change-Id: Ib30f429f7db8cc3503f94a4e6d4505ca7e0f542e
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Guo Ruijing 3 years ago
parent
commit
bca561ecd3
4 changed files with 24 additions and 22 deletions
  1. 2
    2
      README.md
  2. 15
    10
      deployment_scripts/puppet/manifests/ovs-install-compute.pp
  3. 0
    5
      environment_config.yaml
  4. 7
    5
      metadata.yaml

+ 2
- 2
README.md View File

@@ -14,7 +14,7 @@ Requirements
14 14
 
15 15
 | Requirement                      | Version/Comment |
16 16
 |----------------------------------|-----------------|
17
-| Mirantis OpenStack compatibility | 8.0             |
17
+| Mirantis OpenStack compatibility | 9.0             |
18 18
 
19 19
 Recommendations
20 20
 ---------------
@@ -60,7 +60,7 @@ Openvswitch plugin installation
60 60
 
61 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
 
65 65
 8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
66 66
 

+ 15
- 10
deployment_scripts/puppet/manifests/ovs-install-compute.pp View File

@@ -1,16 +1,21 @@
1
-$fuel_settings = parseyaml(file('/etc/compute.yaml'))
1
+$fuel_settings = parseyaml(file('/etc/astute.yaml'))
2 2
 if $operatingsystem == 'Ubuntu' {
3
-    if $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
4
-        $packages='openvswitch-datapath-dkms_2.4.90.dpdk-1 openvswitch-common_2.4.90.dpdk-1 openvswitch-switch_2.4.90.dpdk-1'
3
+    if $fuel_settings['fuel-plugin-ovs']['support_nsh'] and
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'] {
7
-        $packages='openvswitch-datapath-dkms_2.4.90.nsh-1 openvswitch-common_2.4.90.nsh-1  openvswitch-switch_2.4.90.nsh-1'
9
+    elsif $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
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'] {
10
-        $packages='openvswitch-datapath-dkms_2.4.90.nshdpdk-1 openvswitch-common_2.4.90.nshdpdk-1 openvswitch-switch_2.4.90.nshdpdk-1'
11
-    }
12
-    exec { 'ovs install':
13
-        command => '/usr/bin/apt-get -y --force-yes install $packages'
14
+    elsif $fuel_settings['fuel-plugin-ovs']['support_nsh'] {
15
+        exec { 'install ovs/nsh':
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'
17
+        }
14 18
     }
19
+
15 20
 } elsif $operatingsystem == 'CentOS' {
16 21
 }

+ 0
- 5
environment_config.yaml View File

@@ -9,8 +9,3 @@ attributes:
9 9
       weight: 20
10 10
       value: false
11 11
       label: "support NSH"
12
-    support_nsh_dpdk:
13
-      type: "checkbox"
14
-      weight: 20
15
-      value: false
16
-      label: "support NSH & DPDK"

+ 7
- 5
metadata.yaml View File

@@ -3,11 +3,11 @@ name: fuel-plugin-ovs
3 3
 # Human-readable name for your plugin
4 4
 title: Openvswitch with NSH/DPDK support
5 5
 # Plugin version
6
-version: '0.8.0'
6
+version: '0.9.0'
7 7
 # Description
8
-description: 'This plugin provides to deploy openvswitch with nsh'
8
+description: 'This plugin provides to deploy openvswitch with NSH/DPDK'
9 9
 # Required fuel version
10
-fuel_version: ['8.0']
10
+fuel_version: ['9.0']
11 11
 # Specify license of your plugin
12 12
 licenses: ['Apache License Version 2.0']
13 13
 # Specify author or company name
@@ -21,10 +21,12 @@ groups: ['network']
21 21
 # The plugin is compatible with releases in the list
22 22
 releases:
23 23
   - os: ubuntu
24
-    version: liberty-8.0
24
+    version: mitaka-9.0
25 25
     mode: ['ha']
26 26
     deployment_scripts_path: deployment_scripts/
27 27
     repository_path: repositories/ubuntu
28 28
 
29 29
 # Version of plugin package
30
-package_version: '3.0.0'
30
+package_version: '4.0.0'
31
+
32
+is_hotpluggable: false

Loading…
Cancel
Save