Browse Source

Backport for Fuel 10.0

Change-Id: I54bc081979d7b425667c9cbb3430e4fb5dd52f82
Maciej Relewicz 2 years ago
parent
commit
c73e535747

+ 2
- 1
README.md View File

@@ -62,7 +62,8 @@ Networking SFC plugin configuration
62 62
 1. Create an environment.
63 63
 2. Enable L2 Population in network tab.
64 64
 3. Enable the plugin on the Settings tab of the Fuel web UI.
65
-4. Deploy the environment.
65
+4. In tab 'Settings', in section 'General' -> 'Provision' -> 'Initial packages' please change the name of the installed kernel stack from trusty to xenial. For both packages, from linux-headers-generic-lts-trusty and linux-image-generic-lts-trusty to linux-headers-generic-lts-xenial and linux-image-generic-lts-xenial.
66
+5. Deploy the environment.
66 67
 
67 68
 Known issues
68 69
 ------------

+ 0
- 5
deployment_scripts/puppet/manifests/networking-sfc-compute.pp View File

@@ -13,9 +13,6 @@
13 13
 #    under the License.
14 14
 notice('MODULAR: networking-sfc/networking-sfc-compute.pp')
15 15
 
16
-$use_neutron = hiera('use_neutron', false)
17
-
18
-if $use_neutron {
19 16
   include ::neutron::params
20 17
 
21 18
   $neutron_config = hiera_hash('neutron_config')
@@ -48,5 +45,3 @@ if $use_neutron {
48 45
 
49 46
   neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
50 47
   neutron_config { 'sfc/drivers': value => 'ovs' }
51
-
52
-}

+ 0
- 5
deployment_scripts/puppet/manifests/networking-sfc-controller.pp View File

@@ -14,9 +14,6 @@
14 14
 
15 15
 notice('MODULAR: networking-sfc/networking-sfc-controller.pp')
16 16
 
17
-$use_neutron = hiera('use_neutron', false)
18
-
19
-if $use_neutron {
20 17
   include ::neutron::params
21 18
 
22 19
   $primary_controller = hiera('primary_controller')
@@ -80,5 +77,3 @@ if $use_neutron {
80 77
 
81 78
   neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
82 79
   neutron_config { 'sfc/drivers': value => 'ovs' }
83
-
84
-}

+ 4
- 4
metadata.yaml View File

@@ -3,15 +3,15 @@ name: networking-sfc
3 3
 # Human-readable name for your plugin
4 4
 title: Service Function Chaining Extension for OpenStack Networking
5 5
 # Plugin version
6
-version: '1.0.0'
6
+version: '2.0.0'
7 7
 # Description
8 8
 description: Service Function Chaining is a mechanism for overriding the basic destination based forwarding that is typical of IP networks.
9 9
 # Required fuel version
10
-fuel_version: ['9.0']
10
+fuel_version: ['10.0']
11 11
 # Specify license of your plugin
12 12
 licenses: ['Apache License Version 2.0']
13 13
 # Specify author or company name
14
-authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>']
14
+authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>', 'Bartosz Kupidura <bkupidura@mirantis.com>']
15 15
 # A link to the plugin's page
16 16
 homepage: 'https://github.com/damjanek/fuel-plugin-networking-sfc'
17 17
 # Specify a group which your plugin implements, possible options:
@@ -24,7 +24,7 @@ is_hotpluggable: false
24 24
 # The plugin is compatible with releases in the list
25 25
 releases:
26 26
   - os: ubuntu
27
-    version: mitaka-9.0
27
+    version: newton-10.0
28 28
     mode: ['ha']
29 29
     deployment_scripts_path: deployment_scripts/
30 30
     repository_path: repositories/ubuntu

+ 1
- 1
pre_build_hook View File

@@ -12,7 +12,7 @@ GIT_LAST_WORKING_COMMIT=5d69969e999c5fb9a98fb37bb627f1fca789c54c
12 12
 #package information
13 13
 VERSION_NUMBER=${VERSION_NUMBER:-0.0.1}
14 14
 DESCRIPTION="Networking SFC for Openstack"
15
-MAINTAINERS="Maciej Relewicz, Damian Szeluga"
15
+MAINTAINERS="Maciej Relewicz, Damian Szeluga, Bartosz Kupidura"
16 16
 
17 17
 DIR="$(dirname `readlink -f $0`)"
18 18
 TMP_DIR="${DIR}/tmp"

Loading…
Cancel
Save