diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-09 20:22:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-09 20:22:22 +0000 |
| commit | cc3fe3f71da4f97d672e7acfb270913bf0940303 (patch) | |
| tree | d33c70dba8cb18cf14de4695a0abeab6d535cf5e /nova/compute | |
| parent | 814cb1acc3237e7a31b85b43015e46c87231ead7 (diff) | |
| parent | af2acabe35f91d0bdd2b2c921f23d6828e480a20 (diff) | |
Merge "Converting rebuild to use instance objects."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 2c10f77eb..899febcd8 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1190,10 +1190,9 @@ class API(base.Base): params={'reboot_type': reboot_type}) @scheduler_api.reroute_compute("rebuild") - def rebuild(self, context, instance_id, image_href, admin_password, + def rebuild(self, context, instance, image_href, admin_password, name=None, metadata=None, files_to_inject=None): """Rebuild the given instance with the provided metadata.""" - instance = self.db.instance_get(context, instance_id) name = name or instance["display_name"] if instance["vm_state"] != vm_states.ACTIVE: @@ -1207,7 +1206,7 @@ class API(base.Base): self._check_metadata_properties_quota(context, metadata) self.update(context, - instance_id, + instance["id"], metadata=metadata, display_name=name, image_ref=image_href, @@ -1222,7 +1221,7 @@ class API(base.Base): self._cast_compute_message('rebuild_instance', context, - instance_id, + instance["id"], params=rebuild_params) @scheduler_api.reroute_compute("revert_resize") |