summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-30 15:50:54 +0000
committerGerrit Code Review <review@openstack.org>2012-10-30 15:50:54 +0000
commit2ccd67db63c6ab007114bb910204835cee0f2bea (patch)
tree41e7787c1e7c3f4510a56f068f4096d2edb59611
parent2f24d950c00580d650b945830ab79da266acf5ea (diff)
parent615beb2a105d12703009673fb9e0359d673b0968 (diff)
downloadnova-2ccd67db63c6ab007114bb910204835cee0f2bea.tar.gz
nova-2ccd67db63c6ab007114bb910204835cee0f2bea.tar.xz
nova-2ccd67db63c6ab007114bb910204835cee0f2bea.zip
Merge "details the reboot behavior that a virt driver should follow."
-rw-r--r--nova/virt/driver.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index c51a9449f..133a6ccc5 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -200,6 +200,12 @@ class ComputeDriver(object):
block_device_info=None):
"""Reboot the specified instance.
+ After this is called successfully, the instance's state
+ goes back to power_state.RUNNING. The virtualization
+ platform should ensure that the reboot action has completed
+ successfully even in cases in which the underlying domain/vm
+ is paused or halted/stopped.
+
:param instance: Instance object as returned by DB layer.
:param network_info:
:py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`