diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-05-28 23:10:42 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-05-28 23:10:42 -0400 |
| commit | a9278909cbb6d5ea9283231dbd6efc67b812abff (patch) | |
| tree | 51d8b51579fac1706259b8723eabccd4b3b4b869 | |
| parent | 4a01acc3e8d1ad0d1424472703a88a96002ba56f (diff) | |
| download | nova-a9278909cbb6d5ea9283231dbd6efc67b812abff.tar.gz nova-a9278909cbb6d5ea9283231dbd6efc67b812abff.tar.xz nova-a9278909cbb6d5ea9283231dbd6efc67b812abff.zip | |
Update the rebuild_instance function in the compute manager so that it
accepts the arguments that our current compute API sends.
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d1e01f275..3897b3a9e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -331,7 +331,7 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception @checks_instance_lock - def rebuild_instance(self, context, instance_id, image_id): + def rebuild_instance(self, context, instance_id, **kwargs): """Destroy and re-make this instance. A 'rebuild' effectively purges all existing data from the system and @@ -349,7 +349,8 @@ class ComputeManager(manager.SchedulerDependentManager): self._update_state(context, instance_id, power_state.BUILDING) self.driver.destroy(instance_ref) - instance_ref.image_id = image_id + instance_ref.image_id = kwargs.get('image_id') + instance_ref.injected_files = kwargs.get('injected_files', []) self.driver.spawn(instance_ref) self._update_image_id(context, instance_id, image_id) |