diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 19:58:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 19:58:52 +0000 |
| commit | 554ecca217916949753f693891c344f4c6f640c9 (patch) | |
| tree | 24d2d0b082fdb8dcc28dd96a81c125ab91451bb5 | |
| parent | 00b5ec9a00d3d310ff8f924ab356a39215b6a528 (diff) | |
| parent | b788402263a9142f94f91a05e29e2fd21ad39392 (diff) | |
Merge "Fixes instance action exception in "evacuate" API."
| -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 03e9f5445..0603b929d 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' |