diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-15 17:51:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-15 17:51:10 +0000 |
| commit | c303abc2ee08ee5cb34bf90b58ba3daa80d5d256 (patch) | |
| tree | 739a039188aafbaee9209900dc1d7c5a60932335 | |
| parent | 241ea3a0635061589473061dfe36606a63696e05 (diff) | |
| parent | 51b3510387cafec87e39c2a52e8578a66f3488d4 (diff) | |
| download | nova-c303abc2ee08ee5cb34bf90b58ba3daa80d5d256.tar.gz nova-c303abc2ee08ee5cb34bf90b58ba3daa80d5d256.tar.xz nova-c303abc2ee08ee5cb34bf90b58ba3daa80d5d256.zip | |
Merge "Fix LXC volume attach issue"
| -rw-r--r-- | nova/virt/disk/api.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 7b207c09e..6cb19f235 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -127,12 +127,13 @@ def bind(src, target, instance_name): utils.execute('mount', '-o', 'bind', src, target, run_as_root=True) s = os.stat(src) - cgroup_info = "c %s:%s rwm" % (os.major(s.st_rdev), - os.minor(s.st_rdev)) + cgroup_info = "b %s:%s rwm\n" % (os.major(s.st_rdev), + os.minor(s.st_rdev)) cgroups_path = \ - "/sys/fs/cgroup/devices/sysdefault/libvirt/lxc/%s/devices.allow" \ + "/sys/fs/cgroup/devices/libvirt/lxc/%s/devices.allow" \ % instance_name - utils.execute('echo', '>', cgroup_info, cgroups_path, run_as_root=True) + utils.execute('tee', cgroups_path, + process_input=cgroup_info, run_as_root=True) def unbind(target): |