diff options
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/driver.py | 5 | ||||
| -rw-r--r-- | nova/virt/fake.py | 3 | ||||
| -rw-r--r-- | nova/virt/hyperv/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/xenapi/driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 40 |
6 files changed, 0 insertions, 59 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 005012c7f..991a0f6ce 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -635,11 +635,6 @@ class ComputeDriver(object): # TODO(Vek): Need to pass context in for access to auth_token raise NotImplementedError() - def poll_rescued_instances(self, timeout): - """Poll for rescued instances""" - # TODO(Vek): Need to pass context in for access to auth_token - raise NotImplementedError() - def host_power_action(self, host, action): """Reboots, shuts down or powers up the host.""" raise NotImplementedError() diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 6f95256be..b2528b008 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -154,9 +154,6 @@ class FakeDriver(driver.ComputeDriver): def poll_rebooting_instances(self, timeout, instances): pass - def poll_rescued_instances(self, timeout): - pass - def migrate_disk_and_power_off(self, context, instance, dest, instance_type, network_info, block_device_info=None): diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index d1b9904c4..a67274f5d 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -119,9 +119,6 @@ class HyperVDriver(driver.ComputeDriver): def get_volume_connector(self, instance): return self._volumeops.get_volume_connector(instance) - def poll_rescued_instances(self, timeout): - pass - def get_available_resource(self, nodename): return self._hostops.get_available_resource() diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index dbc2346be..263fd5ca4 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1083,10 +1083,6 @@ class LibvirtDriver(driver.ComputeDriver): def poll_rebooting_instances(self, timeout, instances): pass - @exception.wrap_exception() - def poll_rescued_instances(self, timeout): - pass - def _enable_hairpin(self, xml): interfaces = self.get_interfaces(xml) for interface in interfaces: diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 79b408b25..1649ffb47 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -290,10 +290,6 @@ class XenAPIDriver(driver.ComputeDriver): """Poll for rebooting instances""" self._vmops.poll_rebooting_instances(timeout, instances) - def poll_rescued_instances(self, timeout): - """Poll for rescued instances""" - self._vmops.poll_rescued_instances(timeout) - def reset_network(self, instance): """reset networking for specified instance""" self._vmops.reset_network(instance) diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index a68c9eb8d..588ae1604 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -147,7 +147,6 @@ class VMOps(object): self.compute_api = compute.API() self._session = session self._virtapi = virtapi - self.poll_rescue_last_ran = None self.firewall_driver = firewall.load_driver( DEFAULT_FIREWALL_DRIVER, self._virtapi, @@ -1217,45 +1216,6 @@ class VMOps(object): LOG.info(_("Automatically hard rebooting"), instance=instance) self.compute_api.reboot(ctxt, instance, "HARD") - def poll_rescued_instances(self, timeout): - """Look for expirable rescued instances. - - - forcibly exit rescue mode for any instances that have been - in rescue mode for >= the provided timeout - - """ - last_ran = self.poll_rescue_last_ran - if not last_ran: - # We need a base time to start tracking. - self.poll_rescue_last_ran = timeutils.utcnow() - return - - if not timeutils.is_older_than(last_ran, timeout): - # Do not run. Let's bail. - return - - # Update the time tracker and proceed. - self.poll_rescue_last_ran = timeutils.utcnow() - - rescue_vms = [] - for instance in self.list_instances(): - if instance.endswith("-rescue"): - rescue_vms.append(dict(name=instance, - vm_ref=vm_utils.lookup(self._session, - instance))) - - for vm in rescue_vms: - rescue_vm_ref = vm["vm_ref"] - - original_name = vm["name"].split("-rescue", 1)[0] - original_vm_ref = vm_utils.lookup(self._session, original_name) - - self._destroy_rescue_instance(rescue_vm_ref, original_vm_ref) - - self._release_bootlock(original_vm_ref) - self._session.call_xenapi("VM.start", original_vm_ref, False, - False) - def get_info(self, instance, vm_ref=None): """Return data about VM instance.""" vm_ref = vm_ref or self._get_vm_opaque_ref(instance) |