From 8511e361a162afb961654a0aa47ea09ba4b55932 Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Tue, 24 Jan 2017 11:36:15 -0500
Subject: [BGPVPN] Remove l2 in Name; Enable ODL Boron

Since Boron ODL servers always the l3 usecase
so the l2 differentiation does not make sense
anymore.

Depends: https://gerrit.opnfv.org/gerrit/27605

Change-Id: I8bb55387001dfc81845134639ab4e913072f9a27
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
---
 config/deploy/os-odl-bgpvpn-ha.yaml      | 11 +++++++++++
 config/deploy/os-odl-bgpvpn-noha.yaml    | 11 +++++++++++
 config/deploy/os-odl_l2-bgpvpn-ha.yaml   | 10 ----------
 config/deploy/os-odl_l2-bgpvpn-noha.yaml | 10 ----------
 4 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 config/deploy/os-odl-bgpvpn-ha.yaml
 create mode 100644 config/deploy/os-odl-bgpvpn-noha.yaml
 delete mode 100644 config/deploy/os-odl_l2-bgpvpn-ha.yaml
 delete mode 100644 config/deploy/os-odl_l2-bgpvpn-noha.yaml

(limited to 'config')

diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
new file mode 100644
index 00000000..ef51e737
--- /dev/null
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  odl_version: boron
+  tacker: false
+  congress: true
+  sfc: false
+  vpn: true
diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
new file mode 100644
index 00000000..7812d054
--- /dev/null
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  odl_version: boron
+  tacker: false
+  congress: true
+  sfc: false
+  vpn: true
diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
deleted file mode 100644
index 1d29c2bf..00000000
--- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  tacker: false
-  congress: true
-  sfc: false
-  vpn: true
diff --git a/config/deploy/os-odl_l2-bgpvpn-noha.yaml b/config/deploy/os-odl_l2-bgpvpn-noha.yaml
deleted file mode 100644
index 011c2b3d..00000000
--- a/config/deploy/os-odl_l2-bgpvpn-noha.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  tacker: false
-  congress: true
-  sfc: false
-  vpn: true
-- 
cgit 1.2.3-korg