commit 04a918ba98cc5085b749e6d7012bbb169f38ac78
author Michael Polenchuk <mpolenchuk@mirantis.com> Mon Jul 16 13:59:24 2018 +0400
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Jul 16 23:25:28 2018 +0300
tree adf7e49f7abb294141e66a9d17bc616737fc851b
parent 4b2061170e182fcbb4a8159e21ea721f03d063e3

Fixes to virtual-offline-pike-ovs-dpdk/ssl model

 - align dpdk lcore mask with available cpus
 - add hugepages
 - add dpdk interface on compute
 - delete unused nginx from cfg node

Change-Id: I476e3e785eef2790ad8cc7c522c25b12466ac1a2
Closes-Bug: PROD-21450

classes/cluster/virtual-offline-ssl/infra/config.yml

diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index c0a6e64..3fceea5 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -14,7 +14,6 @@
 #-salt/master/formula/pkg/dogtag.yml
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
 - system.keystone.client.single
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
@@ -183,11 +182,15 @@
             linux_system_codename: xenial
         openstack_compute_node01:
           params:
+            dpdk0_name: ens5
+            dpdk0_pci: '"0000:05.00"'
             single_address: 172.16.10.105
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
         openstack_compute_node02:
           params:
+            dpdk0_name: ens5
+            dpdk0_pci: '"0000:05.00"'
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106

classes/cluster/virtual-offline-ssl/openstack/compute.yml

diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index 87d472e..92395c8 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -15,6 +15,7 @@
 - system.nova.compute.nfv.cpu_pinning
 - system.nova.compute.nfv.sriov
 - system.neutron.compute.nfv.dpdk
+- system.nova.compute.nfv.hugepages
 - system.neutron.compute.nfv.sriov
 - system.nova.compute.libvirt.ssl
 - cluster.virtual-offline-ssl
@@ -29,14 +30,16 @@
     sriov_nic01_numvfs: 16
     sriov_nic01_physical_network: physnet3
     sriov_unsafe_interrupts: False
-    dpdk0_pci: '"0000:04:00"'
     nova_cpu_pinning: 0,1,2
     compute_dpdk_driver: uio
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
     compute_ovs_pmd_cpu_mask: "0x6"
     compute_ovs_dpdk_socket_mem: "1024"
-    compute_ovs_dpdk_lcore_mask: "0x400"
+    compute_ovs_dpdk_lcore_mask: "0x1"
     compute_ovs_memory_channels: "2"
+    compute_hugepages_size: 2M
+    compute_hugepages_count: 600
+    compute_hugepages_mount: /mnt/hugepages_2M
     loopback_device_size: 20
   nova:
     compute:
@@ -92,9 +95,14 @@
           - ${_param:primary_interface}
         br-mesh:
           enabled: true
-          type: bridge
-          proto: static
+          type: dpdk_ovs_bridge
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:tenant_interface}
+        dpdk0:
+          name: ${_param:dpdk0_name}
+          pci: ${_param:dpdk0_pci}
+          driver: igb_uio
+          bridge: br-mesh
+          enabled: true
+          type: dpdk_ovs_port
+          n_rxq: 2