x/fuel-plugin-bgpvpn
Code Issues Proposed changes

Uplift to Fuel 10 and OpenStack Newton

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

Change-Id: Ia3622f7123d79f59f9d45efeef7f6982b54f5038
This commit is contained in:
Romanos Skiadas 2017-01-09 15:11:40 +02:00
parent ec80a6b545
commit fefc32d6ba
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -14,7 +14,7 @@ Requirements
| Requirement | Version/Comment | | Requirement | Version/Comment |
|----------------------------------|-----------------| |----------------------------------|-----------------|
| Mirantis OpenStack compatibility | 8.0 | | Mirantis OpenStack compatibility | 10.0 |
Recommendations Recommendations
--------------- ---------------
@ -76,5 +76,4 @@ Contributors
nikolas.hermanns@ericsson.com nikolas.hermanns@ericsson.com
mskalski@mirantis.com mskalski@mirantis.com
tim.irnich@ericsson.com tim.irnich@ericsson.com
rski@intracom-telecom.com

4
deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh
View File

@ -14,9 +14,7 @@ if [ -e conf_file ]; then
exit 1 exit 1
fi fi
if ! grep -q "$service_plugin" $conf_file ; then if ! grep -q "$service_plugin" $conf_file ; then
service_plugins_v1=$(grep "^service_plugins" $conf_file | awk {'print $3'}) service_plugins=$(grep "^service_plugins" $conf_file)
service_plugins_v2=$(grep "^service_plugins" $conf_file | awk {'print $2'})
service_plugins=${service_plugins_v1:-$service_plugins_v2}
sed -i "s/$service_plugins/$service_plugins,$service_plugin/" $conf_file sed -i "s/$service_plugins/$service_plugins,$service_plugin/" $conf_file
fi fi

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.9.0' version: '1.0.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: ['9.0'] fuel_version: ['10.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: mitaka-9.0 version: newton-10.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

@ -8,13 +8,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}
# This commit https://github.com/openstack/networking-bgpvpn/commit/98d038079ee9004ac1032741c5b61e057e9118fc NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-stable/newton}
# breaks builds of deb package using fpm, point to one behind
NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-4b92d0cbe43097e1e86f2b7716f958c16a4e00e3}
#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/mitaka} NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/newton}
# 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}