[nosdn-noha] Meet EPA testcases requirements - pt2

JIRA: FUEL-385

After successfully merging patch
https://gerrit.opnfv.org/gerrit/#/c/61417/ a user can deploy
os-nosdn-nofeature-noha scenario with numa topologies on compute nodes.

In order to be able to run the EPA testcases, there are still some
requirements (see [1]):
  - Testcases expect compute nodes to have hugepages enabled
  - Testcases expect compute nodes to have cgroup-tools package
    installed
  - Testcases expect to have NUMATopologyFilter added to
    enabled_filters in /etc/nova/nova.conf of the controller node

This patch tries to meet the above requirements. First, it installs
the cgroup-tools package on compute nodes. Secondly, it overrides the
default enabled_filters of openstack nova salt package by appending
NUMATopologyFilter in the end (see [2], [3]).

Reference links:
[1] https://docs.google.com/document/d/1sT63M6fnurn4rgYTiUd8ILuXORtx0oHA8Qe-nPeCr2Y/edit
[2] https://github.com/salt-formulas/salt-formula-nova/blob/master/README.rst#custom-scheduler-filters
[3] https://github.com/salt-formulas/salt-formula-nova/blob/master/metadata/service/control/single.yml#L20

Change-Id: I24eb86c53574c80ceb33ecd1bfcb9ef2727d4263
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>

diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
index 767b308..2707c7f 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
@@ -11,6 +11,7 @@
 ---
 classes:
   - service.neutron.compute.single
+  - system.nova.compute.nfv.hugepages
   - cluster.mcp-common-noha.openstack_compute
   - cluster.mcp-ovs-noha
 parameters:
@@ -30,3 +31,7 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
           use_interfaces:
             - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
+    system:
+      package:
+        cgroup-tools:
+          version: latest

diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml
index 939cb28..dd02453 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml
@@ -10,3 +10,9 @@ classes:
   - system.neutron.control.openvswitch.single
   - cluster.mcp-common-noha.openstack_control
   - cluster.mcp-ovs-noha
+parameters:
+  nova:
+    controller:
+      scheduler_default_filters: "DifferentHostFilter,SameHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,\
+                                 CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,\
+                                 ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter"