From b16ce9e22edc765378943072f4a303375fc24e99 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Tue, 4 Apr 2017 12:12:11 -0400
Subject: RPM version update / ovs_dpdk rename

- updating RPM version numbers for Euphrates
- renaming ovs scenario to ovs_dpdk

JIRA: APEX-434

Change-Id: I75e1d96bd613ea04e2ffd12bd41b3a536ff75d7f
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 config/deploy/os-nosdn-ovs-ha.yaml        | 26 --------------------------
 config/deploy/os-nosdn-ovs-noha.yaml      | 26 --------------------------
 config/deploy/os-nosdn-ovs_dpdk-ha.yaml   | 26 ++++++++++++++++++++++++++
 config/deploy/os-nosdn-ovs_dpdk-noha.yaml | 26 ++++++++++++++++++++++++++
 config/deploy/os-odl-ovs-ha.yaml          | 27 ---------------------------
 config/deploy/os-odl-ovs-noha.yaml        | 27 ---------------------------
 config/deploy/os-odl-ovs_dpdk-ha.yaml     | 27 +++++++++++++++++++++++++++
 config/deploy/os-odl-ovs_dpdk-noha.yaml   | 27 +++++++++++++++++++++++++++
 8 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 config/deploy/os-nosdn-ovs-ha.yaml
 delete mode 100644 config/deploy/os-nosdn-ovs-noha.yaml
 create mode 100644 config/deploy/os-nosdn-ovs_dpdk-ha.yaml
 create mode 100644 config/deploy/os-nosdn-ovs_dpdk-noha.yaml
 delete mode 100644 config/deploy/os-odl-ovs-ha.yaml
 delete mode 100644 config/deploy/os-odl-ovs-noha.yaml
 create mode 100644 config/deploy/os-odl-ovs_dpdk-ha.yaml
 create mode 100644 config/deploy/os-odl-ovs_dpdk-noha.yaml

(limited to 'config/deploy')

diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
deleted file mode 100644
index c9d58671..00000000
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: false
-  sdn_l3: false
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  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
diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
deleted file mode 100644
index cf9b854d..00000000
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: false
-  sdn_l3: false
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  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
diff --git a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
new file mode 100644
index 00000000..c9d58671
--- /dev/null
+++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
@@ -0,0 +1,26 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: false
+  sdn_l3: false
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  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
diff --git a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
new file mode 100644
index 00000000..cf9b854d
--- /dev/null
+++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
@@ -0,0 +1,26 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: false
+  sdn_l3: false
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  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
diff --git a/config/deploy/os-odl-ovs-ha.yaml b/config/deploy/os-odl-ovs-ha.yaml
deleted file mode 100644
index ad265699..00000000
--- a/config/deploy/os-odl-ovs-ha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  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
diff --git a/config/deploy/os-odl-ovs-noha.yaml b/config/deploy/os-odl-ovs-noha.yaml
deleted file mode 100644
index 6f7630dc..00000000
--- a/config/deploy/os-odl-ovs-noha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  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
diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml
new file mode 100644
index 00000000..ad265699
--- /dev/null
+++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml
@@ -0,0 +1,27 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  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
diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml
new file mode 100644
index 00000000..6f7630dc
--- /dev/null
+++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml
@@ -0,0 +1,27 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  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
-- 
cgit 1.2.3-korg