14 files changed, 77 insertions, 2 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 73535795..aedd1979 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -81,7 +81,7 @@ deploy_options:
   #      # This is currently the only available option in the nova section. It will
   #      # add the provided string to vcpu_pin_set in nova.conf. This is used to pin
   #      # guest VMs to a set of CPU cores, and is decsribed in more detail here:
-  #      # http://docs.openstack.org/mitaka/config-reference/compute/config-options.html
+  #      # http://docs.openstack.org/ocata/config-reference/compute/config-options.html
   #      libvirtpin: 1
   #    kernel:
   #      # On compute nodes, isolcpus is usually used to reserve cores for use either by VMs
diff --git a/config/deploy/os-nosdn-fdio-ha.yaml b/config/deploy/os-nosdn-fdio-ha.yaml
index 05b075ac..3f0f8a20 100644
--- a/config/deploy/os-nosdn-fdio-ha.yaml
+++ b/config/deploy/os-nosdn-fdio-ha.yaml
@@ -22,6 +22,7 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
     Compute:
       kernel:
         hugepagesz: 2M
@@ -33,3 +34,4 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml
index 321d90c6..5f27bed1 100644
--- a/config/deploy/os-nosdn-fdio-noha.yaml
+++ b/config/deploy/os-nosdn-fdio-noha.yaml
@@ -22,6 +22,7 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
     Compute:
       kernel:
         hugepagesz: 2M
@@ -33,3 +34,4 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
index a72fef35..c9d58671 100644
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
@@ -20,3 +20,7 @@ deploy_options:
         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_dpdk-noha.yaml
index 7d054cec..cf9b854d 100644
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
@@ -20,3 +20,7 @@ deploy_options:
         hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
+      ovs:
+        socket_memory: 1024
+        pmd_cores: 2
+        dpdk_cores: 1
diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml
index ad61e26b..ad61e26b 100644
--- a/config/deploy/os-odl_l3-csit-noha.yaml
+++ b/config/deploy/os-odl-csit-noha.yaml
diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml
index af81e5a5..af81e5a5 100644
--- a/config/deploy/os-odl_l3-fdio-ha.yaml
+++ b/config/deploy/os-odl-fdio-ha.yaml
diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml
index adb37f3d..adb37f3d 100644
--- a/config/deploy/os-odl_l3-fdio-noha.yaml
+++ b/config/deploy/os-odl-fdio-noha.yaml
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index d421c7ca..d421c7ca 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 972b1f85..972b1f85 100644
--- a/config/deploy/os-odl_l3-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
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
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
deleted file mode 120000
index dc20f6fe..00000000
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ /dev/null
@@ -1 +0,0 @@
-os-odl_l3-nofeature-ha.yaml
-\ No newline at end of file
diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-ovn-nofeature-noha.yaml
new file mode 100644
index 00000000..e03ac0ab
--- /dev/null
+++ b/config/deploy/os-ovn-nofeature-noha.yaml
@@ -0,0 +1,10 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: ovn
+  sdn_l3: false
+  tacker: false
+  congress: true
+  sfc: false
+  vpn: false