summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-23 12:28:09 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-23 12:32:12 +0400
commitfad31f80a6ae51b4f600275426cf83431f3e0d56 (patch)
tree59d9a44a5b39da1cfe302d4742356f2620ea0562
parent703edb8c71b02b4a11f4ca3bdeae882fdce7b2dc (diff)
[cgroups] Fix cpu controller name in runtime
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Sergey Novikov <snovikov@mirantis.com> Code-Review+1: Ilya Bumarskov <ibumarskov@mirantis.com> Code-Review+2: Vladimir Khlyunev <vkhlyunev@mirantis.com> Workflow+1: Vladimir Khlyunev <vkhlyunev@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 27 Mar 2017 12:38:06 +0000 Reviewed-on: https://review.openstack.org/448996 Project: openstack/fuel-qa Branch: refs/heads/master
-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):