x
/
fuel-plugin-bgpvpn
Code Issues Proposed changes

Uplift to Fuel8.0 

Change-Id: I6105c4e68763187846a1a3c1c09290950bb50796
This commit is contained in:
Nikolas Hermanns 2016-01-28 19:29:05 +01:00
parent 7137636587
commit 27c8f60947
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp
View File

@ -8,12 +8,10 @@ class networking-bgpvpn {
ensure => installed, ensure => installed,
notify => Service['neutron-server'], notify => Service['neutron-server'],
} }
# This is only needed for kilo.
# fuel-library/puppet/neutron/manifest/server.pp: exec 'neutron-db-sync' was taken as # fuel-library/puppet/neutron/manifest/server.pp: exec 'neutron-db-sync' was taken as
# example. In liberty it is not needed # example. In liberty it is not needed
exec { 'bgpvpn-db-sync': exec { 'bgpvpn-db-sync':
command => 'touch /root/db.sync.done;bgpvpn-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head', command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head',
path => '/usr/local/bin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/sbin', path => '/usr/local/bin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/sbin',
notify => Service['neutron-server'], notify => Service['neutron-server'],
# TODO # TODO
@ -40,5 +38,8 @@ class networking-bgpvpn-backend-config {
fail('Bagpipe driver not yet included. You need to have anotehr bgpvpn dirver: Opendaylight') fail('Bagpipe driver not yet included. You need to have anotehr bgpvpn dirver: Opendaylight')
} }
# In liberty this goes to an own config file # In liberty this goes to an own config file
neutron_config { 'service_providers/service_provider': value => $NETWORKING_BGPVPN_DRIVER;} file { "/etc/neutron/networking_bgpvpn.conf":
ensure => file,
content => template('networking-bgpvpn/networking_bgpvpn.conf.erb'),
}
} }

6
deployment_scripts/puppet/modules/networking-bgpvpn/templates/networking_bgpvpn.conf.erb Normal file
View File

@ -0,0 +1,6 @@
[service_providers]
# both cannot be default, please choose:
service_provider=<%= @NETWORKING_BGPVPN_DRIVER %>
#service_provider=BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default

6
metadata.yaml
View File

@ -3,11 +3,11 @@ name: bgpvpn
# Human-readable name for your plugin # Human-readable name for your plugin
title: BGPVPN plugin title: BGPVPN plugin
# Plugin version # Plugin version
version: '0.2.2' version: '0.8.0'
# Description # Description
description: 'This plugin provides BGPVPN extension for neutron.' description: 'This plugin provides BGPVPN extension for neutron.'
# Required fuel version # Required fuel version
fuel_version: ['7.0'] fuel_version: ['8.0']
# Specify license of your plugin # Specify license of your plugin
licenses: ['Apache License Version 2.0'] licenses: ['Apache License Version 2.0']
# Specify author or company name # Specify author or company name
@ -21,7 +21,7 @@ groups: ['network']
# The plugin is compatible with releases in the list # The plugin is compatible with releases in the list
releases: releases:
- os: ubuntu - os: ubuntu
version: 2015.1.0-7.0 version: liberty-8.0
mode: ['ha', 'multinode'] mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/ deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu repository_path: repositories/ubuntu

6
pre_build_hook
View File

@ -7,11 +7,11 @@ set -eux
# Networking bgpvpn # Networking bgpvpn
NETWORKING_BGPVPN_REPO=${NETWORKING_BGPVPN_REPO:-https://github.com/openstack/networking-bgpvpn.git} NETWORKING_BGPVPN_REPO=${NETWORKING_BGPVPN_REPO:-https://github.com/openstack/networking-bgpvpn.git}
NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-backport/kilo} NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-stable/liberty}
#Networking odl #Networking odl
NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-https://github.com/openstack/networking-odl.git} NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-https://github.com/openstack/networking-odl.git}
NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/kilo} NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/liberty}
# For which systems odl package should be build # For which systems odl package should be build
BUILD_FOR=${BUILD_FOR:-ubuntu} BUILD_FOR=${BUILD_FOR:-ubuntu}
@ -28,13 +28,13 @@ function build_pkg {
ubuntu) ubuntu)
pushd "${DIR}/repositories/${1}/" pushd "${DIR}/repositories/${1}/"
fpm --force -s python -t deb -m 'mskalski@mirantis.com' --python-disable-dependency oslo.config ${TMP_DIR}/networking-bgpvpn/setup.py fpm --force -s python -t deb -m 'mskalski@mirantis.com' --python-disable-dependency oslo.config ${TMP_DIR}/networking-bgpvpn/setup.py
popd
# fpm -C is buggy https://github.com/jordansissel/fpm/issues/818 # fpm -C is buggy https://github.com/jordansissel/fpm/issues/818
# so we have to change the rootdir manually # so we have to change the rootdir manually
pushd ${TMP_DIR}/networking-bgpvpn/ 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 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}/ 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 # 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 # the bgpvpn installation waiting for the ODL installation, when ODL installation