[ovs/dpdk] Parameterize node-specific compute args

- node-specific parameters (nova pinning, hugepages, dpdk) should be
  configurable via IDF, on a per-node basis;
- keep default settings for lf-pod2, with and without DPDK,
  override them for virtual deploys via local-virtual1 IDF;
- leave neutron_tenant_* vars hardcoded for now, as they are required
  on both ctl and cmp nodes - this way we'll deal stricly with
  cmp params, so we can nicely pass them via config.yml to reclass
  per-node (and not per-role), allowing mixed computes later;
- add compute params for ovs/odl-noha, preparing them for
  deployment on baremetal later.

JIRA: ARMBAND-343

Change-Id: I89a58b9565679ab3882d85f07ae817690ae85c67
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>

2 files changed, 2 insertions, 12 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
index 475f3a0fa..925f895a7 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
@@ -14,11 +14,11 @@ parameters:
         dpdk0:
           name: ${_param:dpdk0_name}
           pci: ${_param:dpdk0_pci}
-          driver: igb_uio
+          driver: ${_param:dpdk0_driver}
           enabled: true
           bridge: br-prv
           type: dpdk_ovs_port
-          n_rxq: 2
+          n_rxq: ${_param:dpdk0_n_rxq}
         br-prv:
           enabled: true
           type: dpdk_ovs_bridge
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
index 4d3e9cf6e..1800a58af 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
@@ -12,13 +12,3 @@ parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
     neutron_tenant_vlan_range: "1000:1030"
-    nova_cpu_pinning: "5-7,13-15"
-    compute_hugepages_size: 2M
-    compute_hugepages_count: 8192
-    compute_hugepages_mount: /mnt/hugepages_2M
-    compute_kernel_isolcpu: 2,3,5,6,7,10,11,13,14,15
-    compute_dpdk_driver: uio
-    compute_ovs_pmd_cpu_mask: "0xc04"
-    compute_ovs_dpdk_socket_mem: "2048,2048"
-    compute_ovs_dpdk_lcore_mask: "0x8"
-    compute_ovs_memory_channels: "2"