summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-03-02 17:09:50 -0600
committerJosh Kearney <josh@jk0.org>2011-03-02 17:09:50 -0600
commite34e9dd982870915f8c4dbf84a08bece42b0c592 (patch)
tree9f939f42407abbfbeb3d7b6de116fb1527cb0aef /nova
parent93b69176277217a3cfae738dd328e649081a370f (diff)
downloadnova-e34e9dd982870915f8c4dbf84a08bece42b0c592.tar.gz
nova-e34e9dd982870915f8c4dbf84a08bece42b0c592.tar.xz
nova-e34e9dd982870915f8c4dbf84a08bece42b0c592.zip
Updated docstrings
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/xenapi/vmops.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 1c58f529d..10d5c0160 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -495,7 +495,12 @@ class VMOps(object):
self._wait_with_callback(instance.id, task, callback)
def rescue(self, instance, callback):
- """Rescue the specified instance"""
+ """Rescue the specified instance
+ - shutdown the instance VM
+ - set 'bootlock' to prevent the instance from starting in rescue
+ - spawn a rescue VM (the vm name-label will be instance-N-rescue)
+
+ """
rescue_vm = VMHelper.lookup(self._session, instance.name + "-rescue")
if rescue_vm:
raise RuntimeError(_(
@@ -521,7 +526,12 @@ class VMOps(object):
self._session.call_xenapi("Async.VBD.plug", vbd_ref)
def unrescue(self, instance, callback):
- """Unrescue the specified instance"""
+ """Unrescue the specified instance
+ - unplug the instance VM's disk from the rescue VM
+ - teardown the rescue VM
+ - release the bootlock to allow the instance VM to start
+
+ """
rescue_vm = VMHelper.lookup(self._session, instance.name + "-rescue")
if not rescue_vm: