Skip to content

Commit 2dd4a7f

Browse files
authored
Merge pull request #1355 from rackerlabs/storage_controller_sushy_patch
fix: patch sushy storage controller
2 parents a172077 + 414921b commit 2dd4a7f

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 945b35f790a24613e9f6833d0de67526ea899f86 Mon Sep 17 00:00:00 2001
2+
From: Milan Fencik <[email protected]>
3+
Date: Tue, 21 Oct 2025 18:09:56 +0100
4+
Subject: [PATCH] when contoller doesn't have controller_mode, return None
5+
6+
Signed-off-by: Milan Fencik <[email protected]>
7+
---
8+
sushy_oem_idrac/resources/system/storage/controller.py | 6 +++++-
9+
1 file changed, 5 insertions(+), 1 deletion(-)
10+
11+
diff --git a/sushy_oem_idrac/resources/system/storage/controller.py b/sushy_oem_idrac/resources/system/storage/controller.py
12+
index 6cc13ba..8e12e52 100644
13+
--- a/sushy_oem_idrac/resources/system/storage/controller.py
14+
+++ b/sushy_oem_idrac/resources/system/storage/controller.py
15+
@@ -38,7 +38,11 @@ class DellStorageControllerExtension(oem_base.OEMResourceBase):
16+
:returns: TaskMonitor if controller mode changes applied and need to
17+
reboot, otherwise None
18+
"""
19+
- controller_mode = self.dell_storage_controller.controller_mode
20+
+ # Some controllers do not have controller_mode
21+
+ try:
22+
+ controller_mode = self.dell_storage_controller.controller_mode
23+
+ except AttributeError:
24+
+ return None
25+
26+
# BOSS will have this empty, PERC will have something assigned
27+
if controller_mode and controller_mode != s_cons.ControllerMode.RAID:
28+
--
29+
2.39.2 (Apple Git-143)

containers/ironic/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
0002_skip_reboot_firmware_update.patch
2+
0001-storage-controller_mode-update.patch

0 commit comments

Comments
 (0)