diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-13 05:24:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-13 05:24:00 +0000 |
| commit | c8ecfc285ce890842be3460bf3eb1284e77b3c10 (patch) | |
| tree | 6884252aa0681afb2a6d483cb5e8ec6209ed2f68 | |
| parent | aa7f3eacf72bd9c070ddd0118835d76b1ebc2bc1 (diff) | |
| parent | f38fe82fc62926b6868fea3f89aff80adb22affb (diff) | |
| download | nova-c8ecfc285ce890842be3460bf3eb1284e77b3c10.tar.gz nova-c8ecfc285ce890842be3460bf3eb1284e77b3c10.tar.xz nova-c8ecfc285ce890842be3460bf3eb1284e77b3c10.zip | |
Merge "Move libvirt specific cgroups setup code out of nova.virt.disk.api"
| -rw-r--r-- | nova/virt/disk/api.py | 7 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 529f231af..e71faad70 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -157,13 +157,6 @@ def bind(src, target, instance_name): utils.execute('touch', target, run_as_root=True) utils.execute('mount', '-o', 'bind', src, target, run_as_root=True) - s = os.stat(src) - cgroup_info = "b %s:%s rwm\n" % (os.major(s.st_rdev), - os.minor(s.st_rdev)) - cgroups_path = ("/sys/fs/cgroup/devices/libvirt/lxc/" - "%s/devices.allow" % instance_name) - utils.execute('tee', cgroups_path, - process_input=cgroup_info, run_as_root=True) def unbind(target): diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6dae2589e..e2f70b2b6 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -743,6 +743,13 @@ class LibvirtDriver(driver.ComputeDriver): if lxc_container_target: disk.bind(lxc_host_volume, lxc_container_target, instance_name) + s = os.stat(lxc_host_volume) + cgroup_info = "b %s:%s rwm\n" % (os.major(s.st_rdev), + os.minor(s.st_rdev)) + cgroups_path = ("/sys/fs/cgroup/devices/libvirt/lxc/" + "%s/devices.allow" % instance_name) + utils.execute('tee', cgroups_path, + process_input=cgroup_info, run_as_root=True) @exception.wrap_exception() def _detach_lxc_volume(self, xml, virt_dom, instance_name): |