Skip to content

Instantly share code, notes, and snippets.

@adarobin
Created April 26, 2022 15:21
Show Gist options
  • Save adarobin/24c0e9ec12aa96de6efdc02a7f48ac0f to your computer and use it in GitHub Desktop.
Save adarobin/24c0e9ec12aa96de6efdc02a7f48ac0f to your computer and use it in GitHub Desktop.
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 3cd1eeb9..0d2bae99 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -152,6 +152,7 @@ enabled_deploy_interfaces: "direct,ramdisk"
# These are calculated based on enabled_hardware_types if empty
enabled_bios_interfaces: ""
enabled_boot_interfaces: ""
+enabled_inspect_interfaces: ""
enabled_management_interfaces: ""
enabled_power_interfaces: ""
enabled_raid_interfaces: ""
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/hw_types.yml b/playbooks/roles/bifrost-ironic-install/tasks/hw_types.yml
index b30f04ea..de6994d6 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/hw_types.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/hw_types.yml
@@ -79,3 +79,13 @@
{%- if "ipmi" in enabled_hardware_types -%},ipmitool{%- endif -%}
{%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
when: not enabled_vendor_interfaces
+
+- name: "Configure inspect interfaces if required"
+ set_fact:
+ enabled_inspect_interfaces: >-
+ no-inspect
+ {%- if enable_inspector | bool == true -%},inspector{%- endif -%}
+ {%- if "idrac" in enabled_hardware_types -%},idrac-wsman,idrac-redfish{%- endif -%}
+ {%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
+ {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
+ when: not enabled_inspect_interfaces
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index b1119240..8bd3e536 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -7,8 +7,8 @@ debug = {{ ironic_debug | bool }}
# control instead of ironic, noop is the only available network driver.
enabled_network_interfaces = noop
default_deploy_interface = {{ default_deploy_interface }}
+enabled_inspect_interfaces = {{ enabled_inspect_interfaces }}
{% if enable_inspector | bool == true %}
-enabled_inspect_interfaces = no-inspect,inspector
default_inspect_interface = inspector
{% endif %}
enabled_bios_interfaces = {{ enabled_bios_interfaces }}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment