From b6896a9bbfd7d4825f6b68b594441a3e0be7b85f 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>
(cherry picked from commit a3c2c8c746470c993d70d92d13415e2b4263cc25)
---
 config/deploy/os-odl-fdio_dvr-ha.yaml | 37 +++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 config/deploy/os-odl-fdio_dvr-ha.yaml

(limited to 'config/deploy/os-odl-fdio_dvr-ha.yaml')

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
-- 
cgit 1.2.3-korg