summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorArmando Migliaccio <amigliaccio@internap.com>2012-12-18 14:11:16 +0000
committerArmando Migliaccio <amigliaccio@internap.com>2012-12-18 14:39:40 +0000
commite6acd86b8419018f25e96f484340b7631c3e127b (patch)
treea1e7bdb5f01de63f244312cd3f0a89bf5bf87383 /etc
parent46675d85dbb6c3fb7e417eb0c7ad4a4cccb30523 (diff)
downloadnova-e6acd86b8419018f25e96f484340b7631c3e127b.tar.gz
nova-e6acd86b8419018f25e96f484340b7631c3e127b.tar.xz
nova-e6acd86b8419018f25e96f484340b7631c3e127b.zip
Execute pygrub using nova-rootwrap in xenapi
Preserve the behavior where, if pygrub fails, compute attempts to spawn the VM in HVM mode. Fixes bug #1091628 Change-Id: Ia462964ebb1fc21d8e289de32557a2e7867f1257
Diffstat (limited to 'etc')
-rw-r--r--etc/nova/rootwrap.d/compute.filters3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters
index cb7ad7487..a835122cc 100644
--- a/etc/nova/rootwrap.d/compute.filters
+++ b/etc/nova/rootwrap.d/compute.filters
@@ -92,6 +92,9 @@ iscsiadm: CommandFilter, iscsiadm, root
# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*.
parted: CommandFilter, parted, root
+# nova/virt/xenapi/vm_utils.py: 'pygrub', '-qn', dev_path
+pygrub: CommandFilter, /usr/bin/pygrub, root
+
# nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s
fdisk: CommandFilter, /sbin/fdisk, root