From e0959950c171d63a8839f13b364ed30926ee0386 Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Wed, 11 Oct 2017 17:41:25 +0200 Subject: [PATCH] Using stevedore alias for BGPVPN/L2GW Service Plugin Change-Id: If234fb65cef694fc5851f87621293c2817ec132c Signed-off-by: Ricardo Noriega --- ci/environments/scenario004-multinode-containers.yaml | 2 +- ci/environments/scenario004-multinode.yaml | 2 +- environments/neutron-bgpvpn-opendaylight.yaml | 2 +- environments/neutron-bgpvpn.yaml | 2 +- environments/neutron-l2gw-opendaylight.yaml | 2 +- environments/neutron-l2gw.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 7eb9813e2c..8a84b3c927 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -113,7 +113,7 @@ parameter_defaults: # TODO: in Queens, re-add bgp-vpn and l2gw services when # containerized. # https://bugs.launchpad.net/bugs/1713612 - # NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' + # NeutronServicePlugins: 'router,bgpvpn,l2gw' # BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' # L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] NotificationDriver: 'noop' diff --git a/ci/environments/scenario004-multinode.yaml b/ci/environments/scenario004-multinode.yaml index 0dfeb63a7e..b991f0852a 100644 --- a/ci/environments/scenario004-multinode.yaml +++ b/ci/environments/scenario004-multinode.yaml @@ -101,7 +101,7 @@ parameter_defaults: CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephPoolDefaultSize: 1 SwiftCeilometerPipelineEnabled: false - NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' + NeutronServicePlugins: 'router,bgpvpn,l2gw' BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] NotificationDriver: 'noop' diff --git a/environments/neutron-bgpvpn-opendaylight.yaml b/environments/neutron-bgpvpn-opendaylight.yaml index a87a0df95e..5016cf9018 100644 --- a/environments/neutron-bgpvpn-opendaylight.yaml +++ b/environments/neutron-bgpvpn-opendaylight.yaml @@ -8,5 +8,5 @@ resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml parameter_defaults: - NeutronServicePlugins: 'odl-router_v2,trunk,networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' + NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn' BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default' diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml index 2a63248073..e8d534bbc9 100644 --- a/environments/neutron-bgpvpn.yaml +++ b/environments/neutron-bgpvpn.yaml @@ -12,5 +12,5 @@ resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml parameter_defaults: - NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' + NeutronServicePlugins: 'router,bgpvpn' BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' diff --git a/environments/neutron-l2gw-opendaylight.yaml b/environments/neutron-l2gw-opendaylight.yaml index 2168dbc33f..443b0eb7f4 100644 --- a/environments/neutron-l2gw-opendaylight.yaml +++ b/environments/neutron-l2gw-opendaylight.yaml @@ -8,7 +8,7 @@ resource_registry: OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml parameter_defaults: - NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" + NeutronServicePlugins: "l2gw" L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default'] # Optional diff --git a/environments/neutron-l2gw.yaml b/environments/neutron-l2gw.yaml index bba0968ae7..a789d9f466 100644 --- a/environments/neutron-l2gw.yaml +++ b/environments/neutron-l2gw.yaml @@ -11,7 +11,7 @@ resource_registry: OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml parameter_defaults: - NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" + NeutronServicePlugins: "l2gw" L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] # Optional