ovs nfv lab gtw int

Change-Id: Iaecae283fbd150a4cc4907146a41a5f485c4e5a8
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
index 60a8d20..f89cfcf 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
@@ -27,12 +27,12 @@
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
+        # tenant_interface:
+        #   enabled: true
+        #   name: ${_param:tenant_interface}
+        #   mtu: ${_param:interface_mtu}
+        #   proto: manual
+        #   type: eth
         external_interface:
           enabled: true
           name: ${_param:external_interface}
@@ -52,15 +52,23 @@
           mtu: ${_param:interface_mtu}
           use_interfaces:
           - ${_param:primary_interface}
-        br-mesh:
+        br-prv:
           enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          proto: static
+          type: ovs_bridge
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:tenant_interface}
+        floating-to-prv:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-floating
+          peer: prv-to-floating
+        prv-to-floating:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-prv
+          peer: floating-to-prv
         float-to-ex:
           enabled: true
           type: ovs_port
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index 6171a3c..026a8d7 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -24,16 +24,16 @@
     cluster_vip_address: 172.16.10.254
     cluster_local_address: ${_param:single_address}
 
-    nova_cpu_pinning: "2,3"
-    compute_hugepages_size: 1G
-    compute_hugepages_count: 3
-    compute_hugepages_mount: /mnt/hugepages_1G
+    nova_cpu_pinning: "3"
+    compute_hugepages_size: 2M
+    compute_hugepages_count: 600
+    compute_hugepages_mount: /mnt/hugepages_2M
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
     compute_dpdk_driver: uio
-    compute_ovs_pmd_cpu_mask: "0x6"
+    compute_ovs_pmd_cpu_mask: "0x2"
     compute_ovs_dpdk_socket_mem: "1024"
     compute_ovs_dpdk_lcore_mask: "0x1"
-    compute_ovs_memory_channels: "2"
+    compute_ovs_memory_channels: "1"
 
     cluster_node01_hostname: ctl01
     cluster_node01_address: 172.16.10.101