summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-06-01 23:37:51 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-06-01 23:37:51 -0400
commit0e419c00ef9a463acc704f034e4c37929f0ef2eb (patch)
treedf112dfa2f813c86bac7306427556eee88c2b47b /nova/api
parent16bd0ff62dccda5eba800b2762437d5e86faaafd (diff)
image href should be passed through the rebuild pipeline, not the image id.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 55fed408c..0ef1a83da 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -714,7 +714,6 @@ class ControllerV11(Controller):
LOG.debug(msg)
return faults.Fault(exc.HTTPBadRequest(explanation=msg))
- image_id = common.get_id_from_href(image_href)
personalities = info["rebuild"].get("personality", [])
metadata = info["rebuild"].get("metadata")
name = info["rebuild"].get("name")
@@ -724,7 +723,7 @@ class ControllerV11(Controller):
self._decode_personalities(personalities)
try:
- self.compute_api.rebuild(context, instance_id, image_id, name,
+ self.compute_api.rebuild(context, instance_id, image_href, name,
metadata, personalities)
except exception.BuildInProgress:
msg = _("Instance %d is currently being rebuilt.") % instance_id