When running Ganeti in Docker, LXC instance subsystems can be accessed
using path /sys/fs/cgroup/<subsystem>/lxc/ rather than
/sys/fs/cgroup/<subsystem>/docker/<id>/lxc/ which is the path visible
from outside the Docker container.

Signed-off-by: Viktor Bachraty <[email protected]>
---
 lib/hypervisor/hv_lxc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/hypervisor/hv_lxc.py b/lib/hypervisor/hv_lxc.py
index 514896f..11a2396 100644
--- a/lib/hypervisor/hv_lxc.py
+++ b/lib/hypervisor/hv_lxc.py
@@ -349,9 +349,8 @@ class LXCHypervisor(hv_base.BaseHypervisor):
 
     """
     subsys_dir = cls._GetOrPrepareCgroupSubsysMountPoint(subsystem)
-    base_group = cls._GetCurrentCgroupSubsysGroups().get(subsystem, "")
 
-    return utils.PathJoin(subsys_dir, base_group, "lxc")
+    return utils.PathJoin(subsys_dir, "lxc")
 
   @classmethod
   def _GetCgroupParamPath(cls, param_name, instance_name=None):
-- 
2.7.0.rc3.207.g0ac5344

Reply via email to