summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-27 12:38:06 +0000
committerGerrit Code Review <review@openstack.org>2017-03-27 12:38:06 +0000
commit5f00a195e437b82828ffe40339aff2c659d42d99 (patch)
treeff3e4395d2472820dbad7a7372d2a42b5ef23177
parent094cbbaad5a34f77529665cce44cabb3303c3cc9 (diff)
parentfad31f80a6ae51b4f600275426cf83431f3e0d56 (diff)
Merge "[cgroups] Fix cpu controller name in runtime"
-rw-r--r--fuelweb_test/tests/test_cgroups.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/fuelweb_test/tests/test_cgroups.py b/fuelweb_test/tests/test_cgroups.py
index 00cd69a..ac0a8ee 100644
--- a/fuelweb_test/tests/test_cgroups.py
+++ b/fuelweb_test/tests/test_cgroups.py
@@ -79,7 +79,10 @@ class TestCgroupHa(TestBasic):
79 def generate_lscgroups(cgroups): 79 def generate_lscgroups(cgroups):
80 """Generate a list of lscgroups entities from cgroups dicts.""" 80 """Generate a list of lscgroups entities from cgroups dicts."""
81 81
82 return ["{}:/{}".format(cgroup["controller"], cgroup["process"]) 82 cpu_controller = "cpu,cpuacct"
83 return ["{}:/{}".format(cpu_controller
84 if cgroup["controller"] in cpu_controller
85 else cgroup["controller"], cgroup["process"])
83 for cgroup in cgroups] 86 for cgroup in cgroups]
84 87
85 def apply_cgroups(self, cgroups, node_ids): 88 def apply_cgroups(self, cgroups, node_ids):