From c73e535747fdee33ea61d0bb79c978f6eb1fc8b9 Mon Sep 17 00:00:00 2001
From: Maciej Relewicz <mrelewicz@mirantis.com>
Date: Fri, 1 Jul 2016 15:03:00 +0200
Subject: [PATCH] Backport for Fuel 10.0

Change-Id: I54bc081979d7b425667c9cbb3430e4fb5dd52f82
---
 README.md                                                 | 3 ++-
 .../puppet/manifests/networking-sfc-compute.pp            | 5 -----
 .../puppet/manifests/networking-sfc-controller.pp         | 5 -----
 metadata.yaml                                             | 8 ++++----
 pre_build_hook                                            | 2 +-
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 8c762d5..f71880e 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,8 @@ Networking SFC plugin configuration
 1. Create an environment.
 2. Enable L2 Population in network tab.
 3. Enable the plugin on the Settings tab of the Fuel web UI.
-4. Deploy the environment.
+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.
+5. Deploy the environment.
 
 Known issues
 ------------
diff --git a/deployment_scripts/puppet/manifests/networking-sfc-compute.pp b/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
index a40555c..901d7da 100644
--- a/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
+++ b/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
@@ -13,9 +13,6 @@
 #    under the License.
 notice('MODULAR: networking-sfc/networking-sfc-compute.pp')
 
-$use_neutron = hiera('use_neutron', false)
-
-if $use_neutron {
   include ::neutron::params
 
   $neutron_config = hiera_hash('neutron_config')
@@ -48,5 +45,3 @@ if $use_neutron {
 
   neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
   neutron_config { 'sfc/drivers': value => 'ovs' }
-
-}
diff --git a/deployment_scripts/puppet/manifests/networking-sfc-controller.pp b/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
index f7bd21f..7b33b9a 100644
--- a/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
+++ b/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
@@ -14,9 +14,6 @@
 
 notice('MODULAR: networking-sfc/networking-sfc-controller.pp')
 
-$use_neutron = hiera('use_neutron', false)
-
-if $use_neutron {
   include ::neutron::params
 
   $primary_controller = hiera('primary_controller')
@@ -80,5 +77,3 @@ if $use_neutron {
 
   neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
   neutron_config { 'sfc/drivers': value => 'ovs' }
-
-}
diff --git a/metadata.yaml b/metadata.yaml
index 7074f7d..ffbdf1b 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,15 +3,15 @@ name: networking-sfc
 # Human-readable name for your plugin
 title: Service Function Chaining Extension for OpenStack Networking
 # Plugin version
-version: '1.0.0'
+version: '2.0.0'
 # Description
 description: Service Function Chaining is a mechanism for overriding the basic destination based forwarding that is typical of IP networks.
 # Required fuel version
-fuel_version: ['9.0']
+fuel_version: ['10.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
-authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>']
+authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>', 'Bartosz Kupidura <bkupidura@mirantis.com>']
 # A link to the plugin's page
 homepage: 'https://github.com/damjanek/fuel-plugin-networking-sfc'
 # Specify a group which your plugin implements, possible options:
@@ -24,7 +24,7 @@ is_hotpluggable: false
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: mitaka-9.0
+    version: newton-10.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
diff --git a/pre_build_hook b/pre_build_hook
index a458079..46bba6e 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -12,7 +12,7 @@ GIT_LAST_WORKING_COMMIT=5d69969e999c5fb9a98fb37bb627f1fca789c54c
 #package information
 VERSION_NUMBER=${VERSION_NUMBER:-0.0.1}
 DESCRIPTION="Networking SFC for Openstack"
-MAINTAINERS="Maciej Relewicz, Damian Szeluga"
+MAINTAINERS="Maciej Relewicz, Damian Szeluga, Bartosz Kupidura"
 
 DIR="$(dirname `readlink -f $0`)"
 TMP_DIR="${DIR}/tmp"