diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-31 15:41:18 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-31 15:41:18 -0400 |
| commit | f37edcb18d27585ce6a2074a5f35eb7a84454dcf (patch) | |
| tree | cf08cf1b9e0afff4a5c2b093682852540fdc2cbd /nova | |
| parent | 29396c4c739b6b0a26a1b24beb86aa2e7e2bc474 (diff) | |
Adding explanation keyword to HTTPConflict
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index fc33a8257..563acc59e 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -616,7 +616,7 @@ class ControllerV10(Controller): self.compute_api.rebuild(context, id, image_id) except exception.BuildInProgress: msg = _("Unable to rebuild server that is being rebuilt") - return faults.Fault(exc.HTTPConflict(msg)) + return faults.Fault(exc.HTTPConflict(explanation=msg)) return exc.HTTPAccepted() @@ -670,7 +670,7 @@ class ControllerV11(Controller): self.compute_api.rebuild(context, id, image_id, metadata) except exception.BuildInProgress: msg = _("Unable to rebuild server that is being rebuilt") - return faults.Fault(exc.HTTPConflict(msg)) + return faults.Fault(exc.HTTPConflict(explanation=msg)) return exc.HTTPAccepted() |