diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-19 12:22:50 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-19 12:22:50 -0400 |
| commit | fc43f7433c8b971a7875044a29ed1deb6ca1376f (patch) | |
| tree | 6c424ead55d7666749d2cd13556dac1b4cd9878f /nova/api | |
| parent | 5f5874b0012e77e846ad02c7ce43f10356105f3d (diff) | |
| parent | f5ef0e4bf39e01b46db241f5766db60059d52df3 (diff) | |
merging lp:~rackspace-titan/nova/exceptions-refactor-invalid
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index f221229f0..e4dacfb2e 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -571,9 +571,8 @@ class Controller(common.OpenstackController): """ image_id = image_meta['id'] if image_meta['status'] != 'active': - raise exception.Invalid( - _("Cannot build from image %(image_id)s, status not active") % - locals()) + raise exception.ImageUnacceptable(image_id=image_id, + reason=_("status is not active")) if image_meta.get('container_format') != 'ami': return None, None |