'bgpvpn' entry point for neutron.conf:service_plugins=

Code Issues Proposed changes

Provide a 'bgpvpn' entrypoint definition, to allow the activation
of the service plugins in a less verbose way.
Change-Id: I751861c25e2e301011d2c1738288660e1286a9a1

This commit is contained in:

Thomas Morin

2017年03月13日 13:54:36 +01:00

parent b296d0f36f

commit da9c3d155e

6 changed files with 14 additions and 6 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

2
devstack/plugin.sh

View File

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

setup_develop $NETWORKING_BGPVPN_DIR

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

echo_summary "Enabling networking-bgpvpn service plugin"

_neutron_service_plugin_class_add $BGPVPN_PLUGIN_CLASS

_neutron_service_plugin_class_add bgpvpn

if [[ "$Q_AGENT" == "bagpipe-openvswitch" ]]; then

echo "networking-bagpipe: you don't need to set Q_AGENT=bagpipe-openvswitch anymore"

Q_AGENT=openvswitch``

4
devstack/settings

View File

@@ -1,11 +1,11 @@

NETWORKING_BGPVPN_DIR="$DEST/networking-bgpvpn"

NETWORKING_BGPVPN_CONF="$NEUTRON_CONF_DIR/networking_bgpvpn.conf"

BGPVPN_DASHBOARD_ENABLE="$NETWORKING_BGPVPN_DIR/bgpvpn_dashboard/enabled/*"

BGPVPN_PLUGIN_CLASS="networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin"

NETWORKING_BGPVPN_DRIVER=${NETWORKING_BGPVPN_DRIVER:-BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default}

if is_service_enabled q-svc; then

# l2pop is currently required for bagpipe driver

Q_ML2_PLUGIN_MECHANISM_DRIVERS="openvswitch,l2population"

fi

4
doc/source/installation.rst

View File

@@ -29,11 +29,11 @@ Configuration

=============

The service plugin is enabled in Neutron, by

adding ``networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin`` to the list

adding ``bgpvpn`` to the list

of enabled service plugins in ``neutron.conf`` (typically in ``/etc/neutron/``

but the location used may depend on your setup or packaging). For instance::

service_plugins = networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin,neutron.services.l3_router.l3_router_plugin.L3RouterPlugin

service_plugins = router,bgpvpn

The BGPVPN driver to use is then specified in the ``networking_bgpvpn.conf``

file (located by default under ``/etc/neutron/``, but in any case in one of the

6
releasenotes/notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml Normal file

View File

@@ -0,0 +1,6 @@

features:

- |

The BGPVPN Interconnection API can now be enabled by adding ``bgpvpn`` to

``service_plugins`` in ``neutron.conf``, instead of the verbose

``networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin``.

2
setup.cfg

View File

@@ -41,6 +41,8 @@ heat.constraints =

neutron.bgpvpn = networking_bgpvpn_heat.bgpvpnservice:BGPVPNConstraint

neutron.agent.l2.extensions =

bagpipe_bgpvpn = networking_bgpvpn.neutron.services.service_drivers.bagpipe.agent_extension:BagpipeBgpvpnAgentExtension

neutron.service_plugins =

bgpvpn = networking_bgpvpn.neutron.services.plugin:BGPVPNPlugin

[build_sphinx]

source-dir = doc/source

2
tools/tox_install.sh

View File

@@ -37,7 +37,7 @@ install_project() {

$ZUUL_CLONER --cache-dir \

/opt/git \

--branch $BRANCH_NAME \

git://git.openstack.org \

http://git.openstack.org \

openstack/$project

cd openstack/$project

$install_cmd -e .