summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-08-19 18:34:34 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-08-19 18:34:34 -0400
commitc4e77b67a74cb0828bb9a7ccbedcaa1baeb6188d (patch)
tree93bdbe47903ba961cb85bc49f1a6293ce002117d /nova/compute
parent3bd386cdba53f6a54a29e510c0f9eecf9b9ea7d9 (diff)
Lots of modifications surrounding the OSAPI to remove any mention of dealing with power states and exclusively using vm_states and task_state modules. Currently there are still a number of tests failing, but this is a stopping place for today.
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/vm_states.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/vm_states.py b/nova/compute/vm_states.py
index a1bca6ef4..d3d168001 100644
--- a/nova/compute/vm_states.py
+++ b/nova/compute/vm_states.py
@@ -21,6 +21,7 @@ ACTIVE='active'
BUILD='build'
REBUILD='rebuild'
REBOOT='reboot'
+HARD_REBOOT='hard_reboot'
DELETE='delete'
STOP='stop'
MIGRATE='migrate'
@@ -29,3 +30,4 @@ VERIFY_RESIZE='verify_resize'
PAUSE='pause'
SUSPEND='suspend'
RESCUE='rescue'
+ERROR='error'