summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-19 14:21:33 +0000
committerGerrit Code Review <review@openstack.org>2014-09-19 14:21:33 +0000
commit275f0f26405d0cdcbf5a4f394a6bd8d303c14343 (patch)
treeaedbe32e9c1f049939a57292e6af712f5b014ad0
parent80fb0671ecd054daf18cbd8f0cb9b46aa158891b (diff)
parenta7f5a9d23a3085d079d1abd3415e8e931895046f (diff)
downloadnova-275f0f26405d0cdcbf5a4f394a6bd8d303c14343.tar.gz
Merge "Fix rootwrap for non openstack.org iqn's" into stable/havana
-rw-r--r--etc/nova/rootwrap.d/compute.filters2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters
index 87f3d37624..eda7fcdf3b 100644
--- a/etc/nova/rootwrap.d/compute.filters
+++ b/etc/nova/rootwrap.d/compute.filters
@@ -203,7 +203,7 @@ systool: CommandFilter, systool, root
sginfo: CommandFilter, sginfo, root
sg_scan: CommandFilter, sg_scan, root
cryptsetup: CommandFilter, cryptsetup, root
-ln: RegExpFilter, ln, root, ln, --symbolic, --force, /dev/mapper/ip-.*-iscsi-iqn.2010-10.org.openstack:volume-.*, /dev/disk/by-path/ip-.*-iscsi-iqn.2010-10.org.openstack:volume-.*
+ln: RegExpFilter, ln, root, ln, --symbolic, --force, /dev/mapper/ip-.*-iscsi-iqn.*, /dev/disk/by-path/ip-.*-iscsi-iqn.*
# nova/virt/xenapi/vm_utils.py:
xenstore-read: CommandFilter, xenstore-read, root