diff options
| author | Alex Glikson <glikson@il.ibm.com> | 2013-03-08 13:00:54 +0200 |
|---|---|---|
| committer | Alex Glikson <glikson@il.ibm.com> | 2013-03-11 18:07:10 +0200 |
| commit | b788402263a9142f94f91a05e29e2fd21ad39392 (patch) | |
| tree | 7132f8e8a9aa4ffad48f73cafcd642e7df93cdc8 | |
| parent | f543f347c84e7f5de2c584ca55363e4dee5b0a3d (diff) | |
| download | nova-b788402263a9142f94f91a05e29e2fd21ad39392.tar.gz nova-b788402263a9142f94f91a05e29e2fd21ad39392.tar.xz nova-b788402263a9142f94f91a05e29e2fd21ad39392.zip | |
Fixes instance action exception in "evacuate" API.
'Evacuate' instance action was not created (incl. in the DB) which
caused exception to be raised during action_event_start.
Change-Id: Iec5f0a91f9b08fbdcf3ace1eaa0efbc4d9d8fc04
Fixes: bug 1152512
| -rw-r--r-- | nova/compute/api.py | 3 | ||||
| -rw-r--r-- | nova/compute/instance_actions.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index dc90748a4..bd9010819 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -2470,6 +2470,9 @@ class API(base.Base): instance = self.update(context, instance, expected_task_state=None, task_state=task_states.REBUILDING) + + self._record_action_start(context, instance, instance_actions.EVACUATE) + return self.compute_rpcapi.rebuild_instance(context, instance=instance, new_pass=admin_password, diff --git a/nova/compute/instance_actions.py b/nova/compute/instance_actions.py index 32d280128..f0d9938bc 100644 --- a/nova/compute/instance_actions.py +++ b/nova/compute/instance_actions.py @@ -27,6 +27,7 @@ they are used. CREATE = 'create' DELETE = 'delete' +EVACUATE = 'evacuate' RESTORE = 'restore' STOP = 'stop' START = 'start' |