From fefc32d6ba0e289999137219d5924a14fea01097 Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rski@intracom-telecom.com>
Date: Mon, 9 Jan 2017 15:11:40 +0200
Subject: [PATCH] Uplift to Fuel 10 and OpenStack Newton

- Change repo branches to point to stable/newton
- Fix inject plugins script

Change-Id: Ia3622f7123d79f59f9d45efeef7f6982b54f5038
---
 README.md                                                   | 5 ++---
 .../networking-bgpvpn/templates/inject_service_plugins.sh   | 4 +---
 metadata.yaml                                               | 6 +++---
 pre_build_hook                                              | 6 ++----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 57f99e5..50c842e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Requirements
 
 | Requirement                      | Version/Comment |
 |----------------------------------|-----------------|
-| Mirantis OpenStack compatibility | 8.0             |
+| Mirantis OpenStack compatibility | 10.0            |
 
 Recommendations
 ---------------
@@ -76,5 +76,4 @@ Contributors
 nikolas.hermanns@ericsson.com
 mskalski@mirantis.com
 tim.irnich@ericsson.com
-
-
+rski@intracom-telecom.com
diff --git a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh b/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh
index 3ae0c05..834cd91 100644
--- a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh
+++ b/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh
@@ -14,9 +14,7 @@ if [ -e conf_file ]; then
     exit 1
 fi
 if ! grep -q "$service_plugin" $conf_file ; then
-    service_plugins_v1=$(grep "^service_plugins" $conf_file | awk {'print $3'})
-    service_plugins_v2=$(grep "^service_plugins" $conf_file | awk {'print $2'})
-    service_plugins=${service_plugins_v1:-$service_plugins_v2}
+    service_plugins=$(grep "^service_plugins" $conf_file)
     sed -i "s/$service_plugins/$service_plugins,$service_plugin/" $conf_file
 fi
 
diff --git a/metadata.yaml b/metadata.yaml
index 5703260..3495645 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,11 +3,11 @@ name: bgpvpn
 # Human-readable name for your plugin
 title: BGPVPN plugin
 # Plugin version
-version: '0.9.0'
+version: '1.0.0'
 # Description
 description: 'This plugin provides BGPVPN extension for neutron.'
 # 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
@@ -21,7 +21,7 @@ groups: ['network']
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: mitaka-9.0
+    version: newton-10.0
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
diff --git a/pre_build_hook b/pre_build_hook
index bc6100f..ee71200 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -8,13 +8,11 @@ set -eux
 # Networking bgpvpn
 NETWORKING_BGPVPN_REPO=${NETWORKING_BGPVPN_REPO:-https://github.com/openstack/networking-bgpvpn.git}
 
-# This commit https://github.com/openstack/networking-bgpvpn/commit/98d038079ee9004ac1032741c5b61e057e9118fc
-# breaks builds of deb package using fpm, point to one behind
-NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-4b92d0cbe43097e1e86f2b7716f958c16a4e00e3}
+NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-stable/newton}
 
 #Networking odl
 NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-https://github.com/openstack/networking-odl.git}
-NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/mitaka}
+NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/newton}
 
 # For which systems odl package should be build
 BUILD_FOR=${BUILD_FOR:-ubuntu}