From a3c2c8c746470c993d70d92d13415e2b4263cc25 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Mon, 11 Sep 2017 15:58:49 -0400
Subject: re-enable support for fdio dvr scenario

- Update FDIO scenarios to use master branch images
- Update VPP/HC version to master for all fdio scenarios

apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33
apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607
apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a

Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 config/deploy/os-odl-fdio-dvr-ha.yaml   | 37 ---------------------------------
 config/deploy/os-odl-fdio-dvr-noha.yaml | 37 ---------------------------------
 config/deploy/os-odl-fdio-ha.yaml       |  2 +-
 config/deploy/os-odl-fdio-noha.yaml     |  2 +-
 config/deploy/os-odl-fdio_dvr-ha.yaml   | 37 +++++++++++++++++++++++++++++++++
 config/deploy/os-odl-fdio_dvr-noha.yaml | 37 +++++++++++++++++++++++++++++++++
 6 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100644 config/deploy/os-odl-fdio-dvr-ha.yaml
 delete mode 100644 config/deploy/os-odl-fdio-dvr-noha.yaml
 create mode 100644 config/deploy/os-odl-fdio_dvr-ha.yaml
 create mode 100644 config/deploy/os-odl-fdio_dvr-noha.yaml

(limited to 'config/deploy')

diff --git a/config/deploy/os-odl-fdio-dvr-ha.yaml b/config/deploy/os-odl-fdio-dvr-ha.yaml
deleted file mode 100644
index 6fcbec65..00000000
--- a/config/deploy/os-odl-fdio-dvr-ha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: carbon
-  odl_vpp_routing_node: dvr
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
diff --git a/config/deploy/os-odl-fdio-dvr-noha.yaml b/config/deploy/os-odl-fdio-dvr-noha.yaml
deleted file mode 100644
index e8788d71..00000000
--- a/config/deploy/os-odl-fdio-dvr-noha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: carbon
-  odl_vpp_routing_node: dvr
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml
index c02b22be..2125265e 100644
--- a/config/deploy/os-odl-fdio-ha.yaml
+++ b/config/deploy/os-odl-fdio-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: carbon
+  odl_version: oxygen
   odl_vpp_routing_node: overcloud-novacompute-0
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml
index 4aab0520..17eea880 100644
--- a/config/deploy/os-odl-fdio-noha.yaml
+++ b/config/deploy/os-odl-fdio-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: carbon
+  odl_version: oxygen
   odl_vpp_routing_node: overcloud-novacompute-0
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl-fdio_dvr-ha.yaml b/config/deploy/os-odl-fdio_dvr-ha.yaml
new file mode 100644
index 00000000..0304fa8b
--- /dev/null
+++ b/config/deploy/os-odl-fdio_dvr-ha.yaml
@@ -0,0 +1,37 @@
+---
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: oxygen
+  dvr: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  vpp: true
+  dataplane: fdio
+  performance:
+    Controller:
+      kernel:
+        hugepages: 1024
+        hugepagesz: 2M
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
diff --git a/config/deploy/os-odl-fdio_dvr-noha.yaml b/config/deploy/os-odl-fdio_dvr-noha.yaml
new file mode 100644
index 00000000..9424c080
--- /dev/null
+++ b/config/deploy/os-odl-fdio_dvr-noha.yaml
@@ -0,0 +1,37 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: oxygen
+  dvr: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  vpp: true
+  dataplane: fdio
+  performance:
+    Controller:
+      kernel:
+        hugepages: 1024
+        hugepagesz: 2M
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
-- 
cgit 1.2.3-korg