Merge "devstack: use helper to add a service plugin"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2015年09月11日 08:09:25 +00:00

committed by Gerrit Code Review

parent b16b7a76c3 32ea1be8c9

commit 6d02007f69

3 changed files with 3 additions and 2 deletions

@@ -23,8 +23,6 @@ the forwarding plane) you have to:

* add the following to your ``local.conf``: ::

Q_SERVICE_PLUGIN_CLASSES=networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin

[[post-config|$NETWORKING_BGPVPN_CONF]]

[service_providers]

service_provider=BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default

@@ -12,6 +12,7 @@ elif [[ "1ドル" == "stack" && "2ドル" == "install" ]]; then

 	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

_neutron_service_plugin_class_add $BGPVPN_PLUGIN_CLASS

if is_service_enabled q-svc; then

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

fi

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

NETWORKING_BGPVPN_DIR=$DEST/networking-bgpvpn

NETWORKING_BGPVPN_CONF=$NEUTRON_CONF_DIR/networking_bgpvpn.conf

BGPVPN_PLUGIN_CLASS=networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin