From 14de5d725e74cb885a48146217e2fc9d8f093df6 Mon Sep 17 00:00:00 2001
From: Ricardo Noriega <rnoriega@redhat.com>
Date: Tue, 7 Aug 2018 18:29:54 +0200
Subject: Enable SFC scenarios for Gambia

  - This patch will install OVS 2.9.2 including
    its kernel module which allows native NSH
    headers.
  - Fix Custom OVS due to bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=1544892
  - Tacker is disable for the time being, tacker-conductor
    needs to be enabled.

JIRA: APEX-630

Change-Id: Ia410309fd7053602ce78eae919839d0f57c9742a
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
---
 config/deploy/os-odl-sfc-ha.yaml          |  8 +++++---
 config/deploy/os-odl-sfc-noha.yaml        |  8 +++++---
 config/deploy/os-odl-sfc_queens-ha.yaml   | 13 +++++++++++++
 config/deploy/os-odl-sfc_queens-noha.yaml | 13 +++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 config/deploy/os-odl-sfc_queens-ha.yaml
 create mode 100644 config/deploy/os-odl-sfc_queens-noha.yaml

(limited to 'config')

diff --git a/config/deploy/os-odl-sfc-ha.yaml b/config/deploy/os-odl-sfc-ha.yaml
index 3a87bfe3..e8df1170 100644
--- a/config/deploy/os-odl-sfc-ha.yaml
+++ b/config/deploy/os-odl-sfc-ha.yaml
@@ -3,9 +3,11 @@ global_params:
   ha_enabled: true
 
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: opendaylight
-  odl_version: nitrogen
-  tacker: true
-  congress: true
+  odl_version: master
+  tacker: false
+  congress: false
   sfc: true
   vpn: false
diff --git a/config/deploy/os-odl-sfc-noha.yaml b/config/deploy/os-odl-sfc-noha.yaml
index 2b08af6c..3dac36fa 100644
--- a/config/deploy/os-odl-sfc-noha.yaml
+++ b/config/deploy/os-odl-sfc-noha.yaml
@@ -3,9 +3,11 @@ global_params:
   ha_enabled: false
 
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: opendaylight
-  odl_version: nitrogen
-  tacker: true
-  congress: true
+  odl_version: master
+  tacker: false
+  congress: false
   sfc: true
   vpn: false
diff --git a/config/deploy/os-odl-sfc_queens-ha.yaml b/config/deploy/os-odl-sfc_queens-ha.yaml
new file mode 100644
index 00000000..0cd01466
--- /dev/null
+++ b/config/deploy/os-odl-sfc_queens-ha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  containers: true
+  os_version: queens
+  sdn_controller: opendaylight
+  odl_version: master
+  tacker: false
+  congress: false
+  sfc: true
+  vpn: false
diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_queens-noha.yaml
new file mode 100644
index 00000000..d091b8cf
--- /dev/null
+++ b/config/deploy/os-odl-sfc_queens-noha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  containers: true
+  os_version: queens
+  sdn_controller: opendaylight
+  odl_version: master
+  tacker: false
+  congress: false
+  sfc: true
+  vpn: false
-- 
cgit 1.2.3-korg