openstack/ironic
Code Issues Proposed changes

Merge "Stop incorrectly returning rescue: supported"

Browse Source
This commit is contained in:
Jenkins 2014-03-24 18:47:23 +00:00 committed by Gerrit Code Review
commit d1293ba400
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/fake.py
View File

@ -59,7 +59,6 @@ class FakePXEDriver(base.BaseDriver):
def __init__(self): def __init__(self):
self.power = fake.FakePower() self.power = fake.FakePower()
self.deploy = pxe.PXEDeploy() self.deploy = pxe.PXEDeploy()
self.rescue = self.deploy
self.vendor = pxe.VendorPassthru() self.vendor = pxe.VendorPassthru()
@ -88,7 +87,6 @@ class FakeSeaMicroDriver(base.BaseDriver):
raise exception.DriverNotFound('FakeSeaMicroDriver') raise exception.DriverNotFound('FakeSeaMicroDriver')
self.power = seamicro.Power() self.power = seamicro.Power()
self.deploy = fake.FakeDeploy() self.deploy = fake.FakeDeploy()
self.rescue = self.deploy
self.seamicro_vendor = seamicro.VendorPassthru() self.seamicro_vendor = seamicro.VendorPassthru()
self.pxe_vendor = pxe.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru()
self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface( self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface(

12
ironic/drivers/modules/pxe.py
View File

@ -653,18 +653,6 @@ class PXEDeploy(base.DeployInterface):
_update_neutron(task, node) _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): class VendorPassthru(base.VendorInterface):
"""Interface to mix IPMI and PXE vendor-specific interfaces.""" """Interface to mix IPMI and PXE vendor-specific interfaces."""

4
ironic/drivers/pxe.py
View File

@ -40,7 +40,6 @@ class PXEAndIPMIToolDriver(base.BaseDriver):
def __init__(self): def __init__(self):
self.power = ipmitool.IPMIPower() self.power = ipmitool.IPMIPower()
self.deploy = pxe.PXEDeploy() self.deploy = pxe.PXEDeploy()
self.rescue = self.deploy
self.pxe_vendor = pxe.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru()
self.ipmi_vendor = ipmitool.VendorPassthru() self.ipmi_vendor = ipmitool.VendorPassthru()
self.mapping = {'pass_deploy_info': self.pxe_vendor, self.mapping = {'pass_deploy_info': self.pxe_vendor,
@ -63,7 +62,6 @@ class PXEAndSSHDriver(base.BaseDriver):
def __init__(self): def __init__(self):
self.power = ssh.SSHPower() self.power = ssh.SSHPower()
self.deploy = pxe.PXEDeploy() self.deploy = pxe.PXEDeploy()
self.rescue = self.deploy
self.vendor = pxe.VendorPassthru() self.vendor = pxe.VendorPassthru()
@ -81,7 +79,6 @@ class PXEAndIPMINativeDriver(base.BaseDriver):
def __init__(self): def __init__(self):
self.power = ipminative.NativeIPMIPower() self.power = ipminative.NativeIPMIPower()
self.deploy = pxe.PXEDeploy() self.deploy = pxe.PXEDeploy()
self.rescue = self.deploy
self.pxe_vendor = pxe.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru()
self.ipmi_vendor = ipminative.VendorPassthru() self.ipmi_vendor = ipminative.VendorPassthru()
self.mapping = {'pass_deploy_info': self.pxe_vendor, self.mapping = {'pass_deploy_info': self.pxe_vendor,
@ -105,7 +102,6 @@ class PXEAndSeaMicroDriver(base.BaseDriver):
raise exception.DriverNotFound('PXEAndSeaMicroDriver') raise exception.DriverNotFound('PXEAndSeaMicroDriver')
self.power = seamicro.Power() self.power = seamicro.Power()
self.deploy = pxe.PXEDeploy() self.deploy = pxe.PXEDeploy()
self.rescue = self.deploy
self.seamicro_vendor = seamicro.VendorPassthru() self.seamicro_vendor = seamicro.VendorPassthru()
self.pxe_vendor = pxe.VendorPassthru() self.pxe_vendor = pxe.VendorPassthru()
self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface( self.vendor = seamicro.SeaMicroPXEMultipleVendorInterface(