diff --git a/SOURCES/bz1323962-1-fence_cisco_ucs-Obtain-status-from-different-attr.patch b/SOURCES/bz1323962-1-fence_cisco_ucs-Obtain-status-from-different-attr.patch new file mode 100644 index 0000000..104951c --- /dev/null +++ b/SOURCES/bz1323962-1-fence_cisco_ucs-Obtain-status-from-different-attr.patch @@ -0,0 +1,40 @@ +commit d681273ff1b6fdc9c4e314aa9c9eb28b4a252230 +Author: Marek 'marx' Grac +Date: Tue Feb 9 09:46:21 2016 +0100 + + fence_cisco_ucs: Obtain 'status' from different attribute + +diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py +index bca8087..260925e 100644 +--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py ++++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py +@@ -19,7 +19,7 @@ RE_STATUS = re.compile("", int(options["--shell-timeout"])) + +- result = RE_GET_OPERPOWER.search(res) ++ result = RE_GET_PRESENCE.search(res) + if result == None: + fail(EC_STATUS) + else: + status = result.group(1) + +- if status == "on": +- return "on" +- else: ++ if status in ["missing", "mismatch"]: + return "off" ++ else: ++ return "on" + + def set_power_status(conn, options): + del conn diff --git a/SOURCES/bz1323962-2-fence_cisco_ucs-Obtain-status-from-different-attr.patch b/SOURCES/bz1323962-2-fence_cisco_ucs-Obtain-status-from-different-attr.patch new file mode 100644 index 0000000..190001d --- /dev/null +++ b/SOURCES/bz1323962-2-fence_cisco_ucs-Obtain-status-from-different-attr.patch @@ -0,0 +1,52 @@ +From 9f9a6829ead6199ecb65c4f85f400a0e403c8c47 Mon Sep 17 00:00:00 2001 +From: Marek 'marx' Grac +Date: Mon, 15 Aug 2016 10:48:47 +0200 +Subject: [PATCH] fence_cisco_ucs: Improve a method to obtain status + +On Cisco UCS there are two attributes which are important for obtaining +correct power status of blade. One checks if slot is powered ON and other if +the node is pulled off the blade. +--- + fence/agents/cisco_ucs/fence_cisco_ucs.py | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py +index 648e45f..0d9609d 100644 +--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py ++++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py +@@ -19,6 +19,7 @@ RE_STATUS = re.compile(" - 4.0.11-27.9 +- fence_cisco_ucs: Change endpoint for 'status' action + Resolves: rhbz#1323962 + +* Wed Apr 13 2016 Marek Grac - 4.0.11-27.8 +- fence_cisco_ucs: Change endpoint for 'status' action + Resolves: rhbz#1323962 + * Tue Apr 05 2016 Oyvind Albrigtsen - 4.0.11-27.7 - fence_compute: fix evacuation not working when instance was created by non-admin user