CLOUDSTACK-8443: remove setting up cgroup_controllers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ec82a59 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ec82a59 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ec82a59 Branch: refs/heads/CLOUDSTACK-8443 Commit: 3ec82a598c6aed0f72fc15b35de32575168e40ab Parents: e8fcaa8 Author: Remi Bergsma <git...@remi.nl> Authored: Thu Aug 20 22:51:53 2015 +0200 Committer: Remi Bergsma <git...@remi.nl> Committed: Fri Aug 21 23:32:57 2015 +0200 ---------------------------------------------------------------------- python/lib/cloud_utils.py | 19 ------------------- 1 file changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ec82a59/python/lib/cloud_utils.py ---------------------------------------------------------------------- diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index 243bb40..a98d1c6 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -685,24 +685,6 @@ class SetupCgRules(ConfigTask): enable_service("cgred") -class SetupCgroupControllers(ConfigTask): - name = "qemu cgroup controllers setup" - cfgline = "cgroup_controllers = [ \"cpu\" ]" - filename = "/etc/libvirt/qemu.conf" - - def done(self): - try: - return self.cfgline in file(self.filename,"r").read(-1) - except IOError,e: - if e.errno is 2: raise TaskFailed("qemu has not been properly installed on this system") - raise - - def execute(self): - libvirtqemu = file(self.filename,"r").read(-1) - libvirtqemu = libvirtqemu + "\n" + self.cfgline + "\n" - file("/etc/libvirt/qemu.conf","w").write(libvirtqemu) - - class SetupSecurityDriver(ConfigTask): name = "security driver setup" cfgline = "security_driver = \"none\"" @@ -887,7 +869,6 @@ def config_tasks(brname, pubNic, prvNic): SetupNetworking(brname, pubNic, prvNic), SetupCgConfig(), SetupCgRules(), - SetupCgroupControllers(), SetupSecurityDriver(), SetupLibvirt(), SetupLiveMigration(),
