diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-07-26 17:23:21 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-26 17:23:21 +0000 |
| commit | b45fa225f9477f4bae11cd379288db459d4b3c02 (patch) | |
| tree | 6803f310cf9b71c58d732c984f8b3a99e55e5c6a /nova/api | |
| parent | b1e72bbe231d29ddf62fb2942ab055b5c92f1a0a (diff) | |
| parent | d4803039c19a01087964c499c7e9ef9abfa82f74 (diff) | |
| download | nova-b45fa225f9477f4bae11cd379288db459d4b3c02.tar.gz nova-b45fa225f9477f4bae11cd379288db459d4b3c02.tar.xz nova-b45fa225f9477f4bae11cd379288db459d4b3c02.zip | |
Updates to the compute API and manager so that rebuild, reboot, snapshots, and password resets work with the most recent versions of novaclient.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 7bef1d9b2..d7cabb067 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -447,7 +447,6 @@ class ControllerV10(Controller): def _action_rebuild(self, info, request, instance_id): context = request.environ['nova.context'] - instance_id = int(instance_id) try: image_id = info["rebuild"]["imageId"] @@ -459,7 +458,7 @@ class ControllerV10(Controller): try: self.compute_api.rebuild(context, instance_id, image_id) except exception.BuildInProgress: - msg = _("Instance %d is currently being rebuilt.") % instance_id + msg = _("Instance %s is currently being rebuilt.") % instance_id LOG.debug(msg) raise exc.HTTPConflict(explanation=msg) @@ -560,7 +559,6 @@ class ControllerV11(Controller): def _action_rebuild(self, info, request, instance_id): context = request.environ['nova.context'] - instance_id = int(instance_id) try: image_href = info["rebuild"]["imageRef"] @@ -581,7 +579,7 @@ class ControllerV11(Controller): self.compute_api.rebuild(context, instance_id, image_href, name, metadata, personalities) except exception.BuildInProgress: - msg = _("Instance %d is currently being rebuilt.") % instance_id + msg = _("Instance %s is currently being rebuilt.") % instance_id LOG.debug(msg) raise exc.HTTPConflict(explanation=msg) |