From b6550a4c3f09ff5157045c40c8d7efc8f0132a2a Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Thu, 16 Mar 2023 12:09:48 +0000
Subject: [PATCH] Enable raid interface implementations for ironic hardware
 drivers

This patch enables the native raid driver implementation for each
of the hardware types defined in `ironic_driver_types`. If necessary
this can be overridden in ironic.conf using config overrides.

Change-Id: I28b39b391d307e0a4aa71e13337f646d872925ec
---
 templates/ironic.conf.j2 |  1 +
 vars/main.yml            | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index 81caa164..fdd99559 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -24,6 +24,7 @@ enabled_inspect_interfaces = {{ filtered_ironic_drivers | json_query('[*].inspec
 enabled_management_interfaces = {{ filtered_ironic_drivers | json_query('[*].management') | unique | join(',') }}
 enabled_power_interfaces = {{ filtered_ironic_drivers | json_query('[*].power') | unique | join(',') }}
 enabled_console_interfaces = {{ filtered_ironic_drivers | json_query('[*].console') | unique | join(',') }}
+enabled_raid_interfaces = {{ filtered_ironic_drivers | json_query('[*].raid') | unique | join(',') }}
 
 [agent]
 
diff --git a/vars/main.yml b/vars/main.yml
index 52eeaaef..b6d5e8ae 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -28,6 +28,7 @@ ironic_driver_types:
     management: ilo
     power: ilo
     console: ilo
+    raid: agent
   agent_ipmitool:
     hardware_type: ipmi
     boot: pxe
@@ -36,6 +37,7 @@ ironic_driver_types:
     management: ipmitool
     power: ipmitool
     console: no-console
+    raid: agent
   agent_ipmitool_socat:
     hardware_type: ipmi
     boot: pxe
@@ -44,6 +46,7 @@ ironic_driver_types:
     management: ipmitool
     power: ipmitool
     console: ipmitool-socat
+    raid: agent
   agent_irmc:
     hardware_type: irmc
     boot: irmc-virtual-media
@@ -52,6 +55,7 @@ ironic_driver_types:
     management: irmc
     power: irmc
     console: ipmitool-socat
+    raid: irmc
   pxe_drac:
     hardware_type: idrac
     boot: pxe
@@ -60,6 +64,7 @@ ironic_driver_types:
     management: idrac-wsman
     power: idrac-wsman
     console: no-console
+    raid: idrac-wsman
   pxe_drac_inspector:
     hardware_type: idrac
     boot: pxe
@@ -68,6 +73,7 @@ ironic_driver_types:
     management: idrac-wsman
     power: idrac-wsman
     console: no-console
+    raid: idrac-wsman
   pxe_ilo:
     hardware_type: ilo
     boot: ilo-pxe
@@ -76,6 +82,7 @@ ironic_driver_types:
     management: ilo
     power: ilo
     console: ilo
+    raid: ilo
   pxe_ipmitool:
     hardware_type: ipmi
     boot: pxe
@@ -84,6 +91,7 @@ ironic_driver_types:
     management: ipmitool
     power: ipmitool
     console: no-console
+    raid: no-raid
   pxe_ipmitool_socat:
     hardware_type: ipmi
     boot: pxe
@@ -92,6 +100,7 @@ ironic_driver_types:
     management: ipmitool
     power: ipmitool
     console: ipmitool-socat
+    raid: no-raid
   pxe_irmc:
     hardware_type: irmc
     boot: irmc-pxe
@@ -100,6 +109,7 @@ ironic_driver_types:
     management: irmc
     power: irmc
     console: ipmitool-socat
+    raid: irmc
   pxe_snmp:
     hardware_type: snmp
     boot: pxe
@@ -108,6 +118,7 @@ ironic_driver_types:
     management: fake
     power: snmp
     console: no-console
+    raid: no-raid
 
 ironic_packages_list: >
   {%- set package_list = [] %}