Merge "Enable Ironic Inspector for Cisco Drivers"

This commit is contained in:
Jenkins 2016-02-04 18:35:20 +00:00 committed by Gerrit Code Review
commit f47d4ee6ca
5 changed files with 19 additions and 0 deletions

View File

@ -20,6 +20,10 @@ management operations on the baremetal node (instead of using IPMI). Unlike with
iSCSI deploy in Agent deploy, the ramdisk is responsible for writing the image to
the disk, instead of the conductor.
The CIMC drivers can use the Ironic Inspector service for in-band inspection of
equipment. For more information see the `Ironic Inspector documentation
<http://docs.openstack.org/developer/ironic-inspector/>`_.
Prerequisites
=============

View File

@ -18,6 +18,10 @@ baremetal node (instead of using IPMI).
``agent_ipminative`` drivers.) to deploy the image and uses UCS to do all
management operations on the baremetal node (instead of using IPMI).
The UCS drivers can use the Ironic Inspector service for in-band inspection of
equipment. For more information see the `Ironic Inspector documentation
<http://docs.openstack.org/developer/ironic-inspector/>`_.
Prerequisites
=============

View File

@ -192,6 +192,8 @@ class AgentAndUcsDriver(base.BaseDriver):
self.deploy = agent.AgentDeploy()
self.management = ucs_mgmt.UcsManagement()
self.vendor = agent.AgentVendorInterface()
self.inspect = inspector.Inspector.create_if_enabled(
'AgentAndUcsDriver')
class AgentAndCIMCDriver(base.BaseDriver):
@ -215,6 +217,8 @@ class AgentAndCIMCDriver(base.BaseDriver):
self.deploy = agent.AgentDeploy()
self.management = cimc_mgmt.CIMCManagement()
self.vendor = agent.AgentVendorInterface()
self.inspect = inspector.Inspector.create_if_enabled(
'AgentAndCIMCDriver')
class AgentAndWakeOnLanDriver(base.BaseDriver):

View File

@ -349,6 +349,8 @@ class PXEAndUcsDriver(base.BaseDriver):
self.deploy = iscsi_deploy.ISCSIDeploy()
self.management = ucs_mgmt.UcsManagement()
self.vendor = iscsi_deploy.VendorPassthru()
self.inspect = inspector.Inspector.create_if_enabled(
'PXEAndUcsDriver')
class PXEAndCIMCDriver(base.BaseDriver):
@ -371,6 +373,8 @@ class PXEAndCIMCDriver(base.BaseDriver):
self.deploy = iscsi_deploy.ISCSIDeploy()
self.management = cimc_mgmt.CIMCManagement()
self.vendor = iscsi_deploy.VendorPassthru()
self.inspect = inspector.Inspector.create_if_enabled(
'PXEAndCIMCDriver')
class PXEAndWakeOnLanDriver(base.BaseDriver):

View File

@ -0,0 +1,3 @@
---
features:
- Enabled Inspector Inspection for CIMC and UCS drivers