From da9c3d155e963622bc10950f6d4a5a8c182b56be Mon Sep 17 00:00:00 2001 From: Thomas Morin Date: 2017年3月13日 13:54:36 +0100 Subject: [PATCH] 'bgpvpn' entry point for neutron.conf:service_plugins= Provide a 'bgpvpn' entrypoint definition, to allow the activation of the service plugins in a less verbose way. Change-Id: I751861c25e2e301011d2c1738288660e1286a9a1 --- devstack/plugin.sh | 2 +- devstack/settings | 4 ++-- doc/source/installation.rst | 4 ++-- .../notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml | 6 ++++++ setup.cfg | 2 ++ tools/tox_install.sh | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 1f687b87..eb3aa142 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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`` diff --git a/devstack/settings b/devstack/settings index 36ddc4c9..68c143e8 100755 --- a/devstack/settings +++ b/devstack/settings @@ -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 \ No newline at end of file +fi + diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 53dd6950..cebe6a26 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -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 diff --git a/releasenotes/notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml b/releasenotes/notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml new file mode 100644 index 00000000..798456d8 --- /dev/null +++ b/releasenotes/notes/bgpvpn_service_declaration-6d9ecd2c397e4821.yaml @@ -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``. + diff --git a/setup.cfg b/setup.cfg index 816c4264..5b57115b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 636efb2c..1dc0f736 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -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 .

AltStyle によって変換されたページ (->オリジナル) /