diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-09 04:50:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-09 04:50:29 +0000 |
| commit | 96dc558542a7ae736efac339cc9f857d4d8490cc (patch) | |
| tree | 8ec6607ea4c59add10c985f2eeb02fb5f7b24eb7 | |
| parent | 2bfe319b7096d61443a9b89b35a626e9e4040454 (diff) | |
| parent | 7843a554b02a86d3bc5e2c02e414d630a4be6e27 (diff) | |
| download | nova-96dc558542a7ae736efac339cc9f857d4d8490cc.tar.gz nova-96dc558542a7ae736efac339cc9f857d4d8490cc.tar.xz nova-96dc558542a7ae736efac339cc9f857d4d8490cc.zip | |
Merge "allow disabling file injection completely"
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 0f436a73a..d37d6e7df 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -116,8 +116,8 @@ libvirt_opts = [ cfg.IntOpt('libvirt_inject_partition', default=1, help='The partition to inject to : ' - '-1 => inspect (libguestfs only), 0 => not partitioned, ' - '>0 => partition number'), + '-2 => disable, -1 => inspect (libguestfs only), ' + '0 => not partitioned, >0 => partition number'), cfg.BoolOpt('use_usb_tablet', default=True, help='Sync virtual and real mouse cursors in Windows VMs'), @@ -1534,7 +1534,7 @@ class LibvirtDriver(driver.ComputeDriver): raise # File injection - else: + elif CONF.libvirt_inject_partition != -2: target_partition = None if not instance['kernel_id']: target_partition = CONF.libvirt_inject_partition |