diff --git a/ironic/drivers/fake.py b/ironic/drivers/fake.py index 5ad8377cd3..3d0d690812 100644 --- a/ironic/drivers/fake.py +++ b/ironic/drivers/fake.py @@ -59,7 +59,6 @@ class FakePXEDriver(base.BaseDriver): def __init__(self): self.power = fake.FakePower() self.deploy = pxe.PXEDeploy() - self.rescue = self.deploy self.vendor = pxe.VendorPassthru() @@ -88,7 +87,6 @@ class FakeSeaMicroDriver(base.BaseDriver): raise exception.DriverNotFound('FakeSeaMicroDriver') self.power = seamicro.Power() self.deploy = fake.FakeDeploy() - self.rescue = self.deploy self.seamicro_vendor = seamicro.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru() self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface( diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 8cf9fd42ef..8a557e3d78 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -653,18 +653,6 @@ class PXEDeploy(base.DeployInterface): _update_neutron(task, node) -class PXERescue(base.RescueInterface): - - def validate(self, task, node): - pass - - def rescue(self, task, node): - pass - - def unrescue(self, task, node): - pass - - class VendorPassthru(base.VendorInterface): """Interface to mix IPMI and PXE vendor-specific interfaces.""" diff --git a/ironic/drivers/pxe.py b/ironic/drivers/pxe.py index 6c5d279d50..c5560bc1d4 100644 --- a/ironic/drivers/pxe.py +++ b/ironic/drivers/pxe.py @@ -40,7 +40,6 @@ class PXEAndIPMIToolDriver(base.BaseDriver): def __init__(self): self.power = ipmitool.IPMIPower() self.deploy = pxe.PXEDeploy() - self.rescue = self.deploy self.pxe_vendor = pxe.VendorPassthru() self.ipmi_vendor = ipmitool.VendorPassthru() self.mapping = {'pass_deploy_info': self.pxe_vendor, @@ -63,7 +62,6 @@ class PXEAndSSHDriver(base.BaseDriver): def __init__(self): self.power = ssh.SSHPower() self.deploy = pxe.PXEDeploy() - self.rescue = self.deploy self.vendor = pxe.VendorPassthru() @@ -81,7 +79,6 @@ class PXEAndIPMINativeDriver(base.BaseDriver): def __init__(self): self.power = ipminative.NativeIPMIPower() self.deploy = pxe.PXEDeploy() - self.rescue = self.deploy self.pxe_vendor = pxe.VendorPassthru() self.ipmi_vendor = ipminative.VendorPassthru() self.mapping = {'pass_deploy_info': self.pxe_vendor, @@ -105,7 +102,6 @@ class PXEAndSeaMicroDriver(base.BaseDriver): raise exception.DriverNotFound('PXEAndSeaMicroDriver') self.power = seamicro.Power() self.deploy = pxe.PXEDeploy() - self.rescue = self.deploy self.seamicro_vendor = seamicro.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru() self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface(