From: Scott Baker <smbaker@gmail.com>
Date: Fri, 17 Jan 2014 07:44:37 +0000 (-0800)
Subject: libvirt 1.2.1 support
X-Git-Tag: nodemanager-5.2-10~8
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=2278a219e208ae964d587f3a0bf0d2f299bf1fcb

libvirt 1.2.1 support
---

diff --git a/cgroups.py b/cgroups.py
index bbb74a3..cbdfbe2 100644
--- a/cgroups.py
+++ b/cgroups.py
@@ -56,6 +56,8 @@ def get_cgroup_paths(subsystem="cpuset"):
         os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'),
         # as observed on f20
         os.path.join(BASE_DIR, subsystem ),
+        # as observed on f16 libvirt 1.2.1
+        os.path.join(BASE_DIR, subsystem, 'machine'),
         ]
     # try several locations and return all the results
     # get_cgroup_path will sort it out
@@ -68,9 +70,16 @@ def get_cgroup_paths(subsystem="cpuset"):
 
 def get_cgroup_path(name, subsystem="cpuset"):
     """ Returns the base path for the cgroup with a specific name or None."""
-    return reduce(lambda a, b: b if os.path.basename(b) == name else a,
+    result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
                   get_cgroup_paths(subsystem), None)
 
+    if result is None:
+        name = name + ".libvirt-lxc"
+        result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
+                      get_cgroup_paths(subsystem), None)
+
+    return result
+
 def get_base_path():
     return BASE_DIR