aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitreview5
-rw-r--r--environments/neutron-bgpvpn-opendaylight.yaml8
-rw-r--r--environments/neutron-bgpvpn.yaml2
3 files changed, 8 insertions, 7 deletions
diff --git a/.gitreview b/.gitreview
index 9f14d54..2cebb17 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,4 @@
[gerrit]
-host=review.openstack.org
+host=gerrit.opnfv.org
port=29418
-project=openstack/tripleo-heat-templates.git
-defaultbranch=stable/pike
+project=apex-tripleo-heat-templates.git
diff --git a/environments/neutron-bgpvpn-opendaylight.yaml b/environments/neutron-bgpvpn-opendaylight.yaml
index 1d2e077..c381669 100644
--- a/environments/neutron-bgpvpn-opendaylight.yaml
+++ b/environments/neutron-bgpvpn-opendaylight.yaml
@@ -3,10 +3,12 @@
# This environment file deploys Neutron BGPVPN service and configures
# Opendaylight as its service provider.
#
-# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default
+# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
+# - NeutronServicePlugins: odl-router_v2, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin
+
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
parameter_defaults:
- NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
- BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default'
+ NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn'
+ BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default'
diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml
index 2a63248..e648f01 100644
--- a/environments/neutron-bgpvpn.yaml
+++ b/environments/neutron-bgpvpn.yaml
@@ -6,7 +6,7 @@
#
# - Bagpipe: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default
# - OpenContrail: BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default
-# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default
+# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
# - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml