From a36df896ab212bc3fc1705d1ead949a5fabcd77e Mon Sep 17 00:00:00 2001
From: Navya <navyax.bathula@intel.com>
Date: Fri, 21 Jul 2017 05:59:32 -0700
Subject: [KVMFORNFV]kvm+ovs+dpdk scenario for E-release

This patch consists of implementation of the KVMFORNFV
os-nosdn-kvm_ovs_dpdk-ha and os-nosdn-kvm_ovs_dpdk-ha
scenarios.

Format of comment to trigger gate should be as follows:
start-gate-scenario: os-nosdn-kvm_ovs_dpdk-noha

Change-Id: Ia320ed8ac44f6b62c3875efe5e44a1df7a0fc777
Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
---
 build/rpm_specs/opnfv-apex-common.spec        |  4 ++++
 config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml   | 28 +++++++++++++++++++++++++++
 config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml | 28 +++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml
 create mode 100644 config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index da2d4a04..e478e245 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -48,6 +48,8 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op
 install config/deploy/os-nosdn-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
 install config/deploy/os-nosdn-kvm-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 install config/deploy/os-nosdn-kvm-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
+install config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-ha.yaml
+install config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml
 install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
 install config/deploy/os-odl-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
@@ -133,6 +135,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
diff --git a/config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml
new file mode 100644
index 00000000..1911dcdf
--- /dev/null
+++ b/config/deploy/os-nosdn-kvm_ovs_dpdk-ha.yaml
@@ -0,0 +1,28 @@
+---
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: false
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  rt_kvm: true
+  dataplane: ovs_dpdk
+  performance:
+    Controller:
+      kernel:
+        hugepages: 1024
+        hugepagesz: 2M
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+      ovs:
+        socket_memory: 1024
+        pmd_cores: 2
+        dpdk_cores: 1
+        memory_channels: 1
diff --git a/config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml
new file mode 100644
index 00000000..092e2bba
--- /dev/null
+++ b/config/deploy/os-nosdn-kvm_ovs_dpdk-noha.yaml
@@ -0,0 +1,28 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: false
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  rt_kvm: true
+  dataplane: ovs_dpdk
+  performance:
+    Controller:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 1024
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+      ovs:
+        socket_memory: 1024
+        pmd_cores: 2
+        dpdk_cores: 1
+        memory_channels: 1
-- 
cgit 1.2.3-korg