summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/compute/api.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 06ce2e07e..6e9119f51 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1591,8 +1591,14 @@ class API(base.Base):
@wrap_check_policy
@check_instance_lock
@check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.STOPPED,
- vm_states.RESCUED],
- task_state=[None, task_states.REBOOTING])
+ vm_states.RESCUED, vm_states.PAUSED,
+ vm_states.SUSPENDED],
+ task_state=[None, task_states.REBOOTING,
+ task_states.REBOOTING_HARD,
+ task_states.RESUMING,
+ task_states.UNPAUSING,
+ task_states.PAUSING,
+ task_states.SUSPENDING])
def reboot(self, context, instance, reboot_type):
"""Reboot the given instance."""
if (reboot_type == 'SOFT' and