Browse Source

Merge "Using stevedore alias for BGPVPN/L2GW Service Plugin"

changes/42/500942/11
Zuul 5 years ago committed by Gerrit Code Review
parent
commit
bfa874406c
  1. 2
      ci/environments/scenario004-multinode-containers.yaml
  2. 2
      ci/environments/scenario004-multinode.yaml
  3. 2
      environments/neutron-bgpvpn-opendaylight.yaml
  4. 2
      environments/neutron-bgpvpn.yaml
  5. 2
      environments/neutron-l2gw-opendaylight.yaml
  6. 2
      environments/neutron-l2gw.yaml

2
ci/environments/scenario004-multinode-containers.yaml

@ -124,7 +124,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'

2
ci/environments/scenario004-multinode.yaml

@ -100,7 +100,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'

2
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'

2
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'

2
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

2
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

Loading…
Cancel
Save