diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-12-02 11:36:38 -0500 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-12-02 11:37:26 -0500 |
| commit | 91cfa62b4a09cafa8af0772c68d36de9216dc440 (patch) | |
| tree | d9e9498f2ab69e8e12c3b0e422b3dd78a3636a82 /nova/virt | |
| parent | 7fc79c41e9759310faf5a88f28981f0efb53d431 (diff) | |
EC2 rescue/unrescue is broken, bug 899225
Change-Id: I5a0b9c08a43e8c606d1c885cf7f47382fa4664a8
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/driver.py | 2 | ||||
| -rw-r--r-- | nova/virt/fake.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py index c2056f19d..e12be1f0e 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -296,7 +296,7 @@ class ComputeDriver(object): # TODO(Vek): Need to pass context in for access to auth_token raise NotImplementedError() - def rescue(self, context, instance, network_info): + def rescue(self, context, instance, network_info, image_meta): """Rescue the specified instance""" raise NotImplementedError() diff --git a/nova/virt/fake.py b/nova/virt/fake.py index e860f72d5..feb85b7f1 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -126,7 +126,7 @@ class FakeConnection(driver.ComputeDriver): def agent_update(self, instance, url, md5hash): pass - def rescue(self, context, instance, network_info): + def rescue(self, context, instance, network_info, image_meta): pass def unrescue(self, instance, network_info): diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index edaa11cbb..93507f6c0 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -595,7 +595,7 @@ class LibvirtConnection(driver.ComputeDriver): dom.create() @exception.wrap_exception() - def rescue(self, context, instance, network_info): + def rescue(self, context, instance, network_info, image_meta): """Loads a VM using rescue images. A rescue is normally performed when something goes wrong with the |