summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-08-07 07:26:46 -0500
committerChuck Short <chuck.short@canonical.com>2012-08-07 10:01:33 -0500
commitd113d2590ee22c30b84dd1ce6671175b8c7b1e54 (patch)
treed156f785b98aca47571eb653a696ca15b2bd4154 /etc
parent79a2ea2f5f83dc401d089e357bf35dbdfb8be959 (diff)
downloadnova-d113d2590ee22c30b84dd1ce6671175b8c7b1e54.tar.gz
Added updated locations for iscsiadm
Attaching volumes to instances currently result in a traceback running on 12.10. This is due to the change of location from /sbin to /usr/bin for iscsiadm. Fixes LP: #1033960 Change-Id: Ie8c6214efbac72b2715264a7d9dd7fe5e43ef693 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/nova/rootwrap.d/compute.filters1
-rw-r--r--etc/nova/rootwrap.d/volume.filters1
2 files changed, 2 insertions, 0 deletions
diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters
index 9aa19a11a8..7e6191ce9c 100644
--- a/etc/nova/rootwrap.d/compute.filters
+++ b/etc/nova/rootwrap.d/compute.filters
@@ -101,6 +101,7 @@ dd: CommandFilter, /bin/dd, root
# nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ...
iscsiadm: CommandFilter, /sbin/iscsiadm, root
+iscsiadm_usr: CommandFilter, /usr/bin/iscsiadm, root
# nova/virt/xenapi/vm_utils.py: parted, --script, ...
# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*.
diff --git a/etc/nova/rootwrap.d/volume.filters b/etc/nova/rootwrap.d/volume.filters
index 6e68356a07..9451e5115b 100644
--- a/etc/nova/rootwrap.d/volume.filters
+++ b/etc/nova/rootwrap.d/volume.filters
@@ -26,3 +26,4 @@ lvdisplay: CommandFilter, /sbin/lvdisplay, root
# nova/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
# nova/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
iscsiadm: CommandFilter, /sbin/iscsiadm, root
+iscsiadm_usr: CommandFilter, /usr/bin/iscsiadm, root