From fad31f80a6ae51b4f600275426cf83431f3e0d56 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 23 Mar 2017 12:28:09 +0400 Subject: [PATCH] [cgroups] Fix cpu controller name in runtime Change-Id: Ibe2bd7cb6d63389cce6677a2c4552d06f3f02e9c Related-Bug: #1669747 --- fuelweb_test/tests/test_cgroups.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuelweb_test/tests/test_cgroups.py b/fuelweb_test/tests/test_cgroups.py index 00cd69af5..ac0a8eeab 100644 --- a/fuelweb_test/tests/test_cgroups.py +++ b/fuelweb_test/tests/test_cgroups.py @@ -79,7 +79,10 @@ class TestCgroupHa(TestBasic): def generate_lscgroups(cgroups): """Generate a list of lscgroups entities from cgroups dicts.""" - return ["{}:/{}".format(cgroup["controller"], cgroup["process"]) + cpu_controller = "cpu,cpuacct" + return ["{}:/{}".format(cpu_controller + if cgroup["controller"] in cpu_controller + else cgroup["controller"], cgroup["process"]) for cgroup in cgroups] def apply_cgroups(self, cgroups, node_ids):