Read networking_bgpvpn.conf for service providers

Code Issues Proposed changes

With this patch, Neutron will read (/etc/neutron/)networking_bgpvpn.conf
for service_provider definitions, thus allowing the use of
the BGPVPN service plugin additionally to other service relying
on their own neutron_*aas.conf file.
This patch also fixes README and devstack behavior so that
a default networking-bgpvpn.conf file is deployed.
This depends on change Ia4cad678e6c722ca05821dbdbf05d61523246a86
Change-Id: Ifebe4c965448431737d9f0e4c25605b718850460
Closes-bug: 1473119

This commit is contained in:

Thomas Morin

2015年08月03日 17:08:27 +02:00

parent bc18f5170a

commit 5be327bef1

8 changed files with 41 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh

View File

@@ -10,6 +10,7 @@ if [[ "1ドル" == "source" ]]; then

elif [[ "1ドル" == "stack" && "2ドル" == "install" ]]; then

setup_develop $NETWORKING_BGPVPN_DIR

 	mkdir -p $NEUTRON_CONF_DIR/policy.d && cp $NETWORKING_BGPVPN_DIR/etc/neutron/policy.d/bgpvpn.conf $NEUTRON_CONF_DIR/policy.d

	mkdir -p $(dirname $NETWORKING_BGPVPN_CONF) && cp $NETWORKING_BGPVPN_DIR/etc/neutron/networking_bgpvpn.conf $NETWORKING_BGPVPN_CONF

elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then

if is_service_enabled q-svc; then

bgpvpn-db-manage --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE upgrade head

2
devstack/settings

View File

@@ -1,2 +1,2 @@

NETWORKING_BGPVPN_DIR=$DEST/networking-bgpvpn

NETWORKING_BGPVPN_CONF=$NEUTRON_CONF_DIR/networking_bgpvpn.conf