diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-06 17:09:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-06 17:09:16 +0000 |
| commit | b3572e21a63b255f61b0a030c3c1463eb07bfa98 (patch) | |
| tree | f9246e73fa89d6d41ecfb7ba866f5660e93b6ea5 | |
| parent | 659342feff6a127a852b10d883af9c9c20db6a31 (diff) | |
| parent | b5bd5188b5928b21507d56075bec252a53190b12 (diff) | |
Merge "Pass partition into libvirt file injection"
| -rw-r--r-- | nova/virt/libvirt/connection.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 9884514ea..f56e45df4 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -738,10 +738,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): @@ -1118,7 +1119,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): |