diff --git a/SOURCES/bz1412722-cisco_ucs-admin.patch b/SOURCES/bz1412722-cisco_ucs-admin.patch new file mode 100644 index 0000000..22076ce --- /dev/null +++ b/SOURCES/bz1412722-cisco_ucs-admin.patch @@ -0,0 +1,28 @@ +From eb43835fc430651712271a046c61eec1c5ecdedb Mon Sep 17 00:00:00 2001 +From: Marek 'marx' Grac +Date: Mon, 23 Jan 2017 14:49:14 +0100 +Subject: [PATCH] fence_cisco_ucs: Commands sent to Cisco UCS are changed to + +Resolves: rhbz#1410881 +--- + fence/agents/cisco_ucs/fence_cisco_ucs.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py +index d21b278..701f690 100644 +--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py ++++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py +@@ -71,8 +71,8 @@ def set_power_status(conn, options): + del conn + + action = { +- 'on' : "up", +- 'off' : "down" ++ 'on' : "admin-up", ++ 'off' : "admin-down" + }[options["--action"]] + + send_command(options, "" + +-- +2.4.11 + diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 53b956c..c953f1f 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -16,7 +16,7 @@ Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 4.0.11 -Release: 47%{?alphatag:.%{alphatag}}%{?dist}.2 +Release: 47%{?alphatag:.%{alphatag}}%{?dist}.3 License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sourceware.org/cluster/wiki/ @@ -120,6 +120,7 @@ Patch95: bz1298430-2-fence_cisco_ucs-status.patch Patch96: bz1287059-2-fence_rhevm-add-filter-header.patch Patch97: bz1387590-compute-fix-plug-domain-name-nova-force-down.patch Patch98: bz1397889-monitor_port_as_ip.patch +Patch99: bz1412722-cisco_ucs-admin.patch %if 0%{?rhel} %global supportedagents apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump rhevm rsa rsb scsi vmware_soap wti @@ -244,6 +245,7 @@ BuildRequires: autoconf automake libtool %patch96 -p1 -F2 -b .bz1287059-2 %patch97 -p1 -b .bz1393789 %patch98 -p1 -b .bz1397889 +%patch99 -p1 -b .bz1412722 %build ./autogen.sh @@ -811,6 +813,10 @@ The fence-agents-zvm package contains a fence agent for z/VM hypervisors %endif %changelog +* Mon Jan 23 2017 Marek Grac - 4.0.11-47.3 +- fence_cisco_ucs: Change command sent to UCS + Resolves: rhbz#1412722 + * Wed Nov 23 2016 Marek Grac - 4.0.11-47.2 - fencing: Fix 'monitor' action for devices with --port-as-ip Resolves: rhbz#1397889