summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-01-13 10:47:23 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2011-01-13 10:47:23 -0600
commit702d1bd5e58c15e5b7f43e9d56bd591d728ecb71 (patch)
tree208749bc372d5e4f9606739dbf041bc9234ee28b
parentf26032b24b4eb22b5a81646756f6a8071e367c24 (diff)
Make driver calls compatible
-rw-r--r--nova/virt/libvirt_conn.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index c03046703..797ac1b60 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -328,7 +328,7 @@ class LibvirtConnection(object):
raise exception.APIError("resume not supported for libvirt")
@exception.wrap_exception
- def rescue(self, instance):
+ def rescue(self, instance, callback=None):
self.destroy(instance, False)
xml = self.to_xml(instance, rescue=True)
@@ -358,7 +358,7 @@ class LibvirtConnection(object):
return timer.start(interval=0.5, now=True)
@exception.wrap_exception
- def unrescue(self, instance):
+ def unrescue(self, instance, callback=None):
# NOTE(vish): Because reboot destroys and recreates an instance using
# the normal xml file, we can just call reboot here
self.reboot(instance)