From 7137636587724561bf437e84295e0fb6f6f9aef1 Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Mon, 14 Dec 2015 18:16:26 +0100
Subject: [PATCH] Add networking_odl as dependency

Networking odl is needed cause it is a dependencie.
There is no way yet to make the bgpvpn installation
waiting for the ODL installation, when ODL
installation is optional:
http://permalink.gmane.org/gmane.comp.cloud.openstack.devel/63333

Change-Id: I9971302b2a76bb7b1013e247821c35c16c6e7b40
---
 .../modules/networking-bgpvpn/manifests/init.pp  |  3 +++
 metadata.yaml                                    |  2 +-
 pre_build_hook                                   | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp b/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp
index 0262ecc..e62aa48 100644
--- a/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp
@@ -32,6 +32,9 @@ class networking-bgpvpn-backend-config {
     require networking-bgpvpn
     if hiera('opendaylight', false) {
         $NETWORKING_BGPVPN_DRIVER = 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default'
+        package {'python-networking-odl':
+            ensure => installed,
+        }
     }
     else {
         fail('Bagpipe driver not yet included. You need to have anotehr bgpvpn dirver: Opendaylight')
diff --git a/metadata.yaml b/metadata.yaml
index 0bc0518..b37b2e8 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,7 +3,7 @@ name: bgpvpn
 # Human-readable name for your plugin
 title: BGPVPN plugin
 # Plugin version
-version: '0.2.1'
+version: '0.2.2'
 # Description
 description: 'This plugin provides BGPVPN extension for neutron.'
 # Required fuel version
diff --git a/pre_build_hook b/pre_build_hook
index 0f795ca..f85468d 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -9,6 +9,10 @@ set -eux
 NETWORKING_BGPVPN_REPO=${NETWORKING_BGPVPN_REPO:-https://github.com/openstack/networking-bgpvpn.git}
 NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-backport/kilo}
 
+#Networking odl
+NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-https://github.com/openstack/networking-odl.git}
+NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/kilo}
+
 # For which systems odl package should be build
 BUILD_FOR=${BUILD_FOR:-ubuntu}
 
@@ -31,8 +35,13 @@ function build_pkg {
       pushd ${TMP_DIR}/networking-bgpvpn/
       fpm --force -s dir -t deb -m 'nikolas.hermanns@ericsson.com' --config-files etc  -n networking-bgpvpn-config -v 1.0 etc
       mv networking-bgpvpn-config_*_amd64.deb ${DIR}/repositories/${1}/
-      popd
 
+      # Networking odl is needed cause it is a dependencie. There is no way yet to make
+      # the bgpvpn installation waiting for the ODL installation, when ODL installation
+      # is optional: http://permalink.gmane.org/gmane.comp.cloud.openstack.devel/63333
+      fpm --force -s python -t deb -m 'nikolas.hermanns@ericsson.com' --no-python-dependencies -d python-pbr -d python-babel -d python-neutron ${TMP_DIR}/networking_odl/setup.py
+
+      popd
       ;;
     *) echo "Not supported system"; exit 1;;
   esac
@@ -53,6 +62,11 @@ git checkout $NETWORKING_BGPVPN_BRANCH
 sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
 sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
 popd
+git clone $NETWORKING_ODL_REPO networking_odl
+pushd networking_odl
+git checkout $NETWORKING_ODL_BRANCH
+popd
+
 popd
 
 for system in $BUILD_FOR