diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-26 14:43:27 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-26 14:43:27 -0400 |
| commit | f53a92748320e95a5a2ec60c76bb429f90c3a4f4 (patch) | |
| tree | aef0f3412c199e297238139ae8495e77d3e96f25 /nova/compute | |
| parent | 63b26178407423524390b2a47425b6953c910e00 (diff) | |
| parent | 9cef60664f0619b608cef182cc65306caf5c348c (diff) | |
Merged trunk and fixed conflicts.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 47ad04930..595622ba1 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1061,12 +1061,12 @@ class API(base.Base): instance_id, metadata=metadata, display_name=name, + image_ref=image_href, vm_state=vm_states.ACTIVE, task_state=task_states.REBUILDING) rebuild_params = { "new_pass": admin_password, - "image_ref": image_href, "injected_files": files_to_inject, } diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b4c6abae0..167be66db 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -524,7 +524,7 @@ class ComputeManager(manager.SchedulerDependentManager): :param context: `nova.RequestContext` object :param instance_id: Instance identifier (integer) - :param image_ref: Image identifier (href or integer) + :param injected_files: Files to inject :param new_pass: password to set on rebuilt instance """ context = context.elevated() @@ -549,6 +549,7 @@ class ComputeManager(manager.SchedulerDependentManager): image_ref = kwargs.get('image_ref') instance_ref.image_ref = image_ref + instance_ref.injected_files = kwargs.get('injected_files', []) network_info = self.network_api.get_instance_nw_info(context, instance_ref) |