diff --git a/ironic-config/ironic.conf.j2 b/ironic-config/ironic.conf.j2 index 517ae01d2..e65276ad6 100644 --- a/ironic-config/ironic.conf.j2 +++ b/ironic-config/ironic.conf.j2 @@ -4,17 +4,17 @@ debug = true default_deploy_interface = direct default_inspect_interface = {% if env.USE_IRONIC_INSPECTOR == "true" %}inspector{% else %}agent{% endif %} default_network_interface = noop -enabled_bios_interfaces = idrac-wsman,no-bios,redfish,idrac-redfish,irmc,ilo +enabled_bios_interfaces = no-bios,redfish,idrac-redfish,irmc,ilo enabled_boot_interfaces = ipxe,ilo-ipxe,pxe,ilo-pxe,fake,redfish-virtual-media,idrac-redfish-virtual-media,ilo-virtual-media enabled_deploy_interfaces = direct,fake,ramdisk,custom-agent # NOTE(dtantsur): when changing this, make sure to update the driver # dependencies in Dockerfile. -enabled_hardware_types = ipmi,idrac,irmc,fake-hardware,redfish,ibmc,manual-management,ilo,ilo5 -enabled_inspect_interfaces = {% if env.USE_IRONIC_INSPECTOR == "true" %}inspector{% else %}agent{% endif %},idrac-wsman,irmc,fake,redfish,ilo -enabled_management_interfaces = ipmitool,idrac-wsman,irmc,fake,redfish,idrac-redfish,ibmc,ilo,ilo5,noop -enabled_power_interfaces = ipmitool,idrac-wsman,irmc,fake,redfish,idrac-redfish,ibmc,ilo -enabled_raid_interfaces = no-raid,irmc,agent,fake,ibmc,idrac-wsman,redfish,idrac-redfish,ilo5 -enabled_vendor_interfaces = no-vendor,ipmitool,idrac-wsman,idrac-redfish,redfish,ilo,fake,ibmc +enabled_hardware_types = ipmi,idrac,irmc,fake-hardware,redfish,manual-management,ilo,ilo5 +enabled_inspect_interfaces = {% if env.USE_IRONIC_INSPECTOR == "true" %}inspector{% else %}agent{% endif %},irmc,fake,redfish,ilo +enabled_management_interfaces = ipmitool,irmc,fake,redfish,idrac-redfish,ilo,ilo5,noop +enabled_power_interfaces = ipmitool,irmc,fake,redfish,idrac-redfish,ilo +enabled_raid_interfaces = no-raid,irmc,agent,fake,redfish,idrac-redfish,ilo5 +enabled_vendor_interfaces = no-vendor,ipmitool,idrac-redfish,redfish,ilo,fake enabled_firmware_interfaces = no-firmware,fake,redfish {% if env.IRONIC_EXPOSE_JSON_RPC | lower == "true" %} rpc_transport = json-rpc diff --git a/ironic-rpm-list b/ironic-rpm-list index 2fde51a89..373c2b605 100644 --- a/ironic-rpm-list +++ b/ironic-rpm-list @@ -3,9 +3,7 @@ openstack-ironic openstack-ironic-api openstack-ironic-conductor openstack-ironic-inspector -python3-dracclient python3-gunicorn -python3-ibmcclient python3-ironic-prometheus-exporter python3-proliantutils python3-scciclient diff --git a/ironic-source-list b/ironic-source-list index 6f5a8c28a..436650f96 100644 --- a/ironic-source-list +++ b/ironic-source-list @@ -30,8 +30,6 @@ ironic-lib ironic-prometheus-exporter proliantutils PyMySQL>=0.8.0 -python-dracclient -python-ibmcclient python-scciclient {% if env.SUSHY_SOURCE %} {% if path.isdir('/sources/' + env.SUSHY_SOURCE) %}