diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-04 22:05:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-04 22:05:37 +0000 |
| commit | 23fba70fd8c79621aae57f8bd76f5fbb60cfd5da (patch) | |
| tree | fcc1fb8c7502ae6b91446c5a4fafeb14e8b59355 /nova/db | |
| parent | da738810ee191bdfbff4c00b4ca583d9ca26bfb1 (diff) | |
| parent | 74da7dbb8451ae0d85c8f2f9ae0f6619297b227d (diff) | |
Merge "Push 'Error' result from event to instance action."
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 45095576a..fdf575f2b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4551,6 +4551,10 @@ def action_event_finish(context, values): raise exception.InstanceActionEventNotFound(action_id=action['id'], event=values['event']) event_ref.update(values) + + if values['result'].lower() == 'error': + action.update({'message': 'Error'}) + return event_ref |