From b5bd5188b5928b21507d56075bec252a53190b12 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 5 Feb 2012 11:28:23 -0800 Subject: Pass partition into libvirt file injection Fixes bug 927289 Change-Id: If290cea2fe509e7e972ff614bddf958edcc621f6 --- nova/virt/libvirt/connection.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 077fe0e8d..2549ddb19 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -736,10 +736,11 @@ class LibvirtConnection(driver.ComputeDriver): fp.write(data) return fpath - def _inject_files(self, instance, files): + def _inject_files(self, instance, files, partition): disk_path = os.path.join(FLAGS.instances_path, instance['name'], 'disk') - disk.inject_files(disk_path, files, use_cow=FLAGS.use_cow_images) + disk.inject_files(disk_path, files, partition=partition, + use_cow=FLAGS.use_cow_images) @exception.wrap_exception() def get_console_output(self, instance): @@ -1116,7 +1117,8 @@ class LibvirtConnection(driver.ComputeDriver): files_to_inject = instance.get('injected_files') if files_to_inject: - self._inject_files(instance, files_to_inject) + self._inject_files(instance, files_to_inject, + partition=target_partition) @staticmethod def _volume_in_mapping(mount_device, block_device_info): -- cgit