fence-agents: master - fence_ipmilan: New symlink fence_ilo4

Marek GrĂ¡c marx at fedoraproject.org
Mon Jul 15 12:50:58 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=3b6970b97f729d60adfa728dcda67367c5e23057
Commit:        3b6970b97f729d60adfa728dcda67367c5e23057
Parent:        c6d8c625c33451990473fef5ee735b18e28cdad1
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Jul 10 11:02:32 2013 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Jul 10 11:02:32 2013 +0200

fence_ipmilan: New symlink fence_ilo4

For HP iLO4, there is no need to have a power wait and only 'lanplus' option is required.

Resolves: rhbz#870269
---
 fence/agents/ipmilan/Makefile.am |    2 +-
 fence/agents/ipmilan/ipmilan.c   |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am
index c4fc636..9e71858 100644
--- a/fence/agents/ipmilan/Makefile.am
+++ b/fence/agents/ipmilan/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 TARGET			= fence_ipmilan
 
-SYMTARGET		= fence_ilo3 fence_imm fence_idrac
+SYMTARGET		= fence_ilo3 fence_ilo4 fence_imm fence_idrac
 
 sbin_PROGRAMS		= $(TARGET)
 
diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c
index 1eb733e..4d286ea 100644
--- a/fence/agents/ipmilan/ipmilan.c
+++ b/fence/agents/ipmilan/ipmilan.c
@@ -904,6 +904,7 @@ static void print_xml_metadata(char *pname) {
   printf("%s\n","<?xml version=\"1.0\" ?>");
   printf("%s%s%s\n","<resource-agent name=\"",pname,"\" shortdesc=\"Fence agent for IPMI over LAN\">");
   printf("<symlink name=\"fence_ilo3\" shortdesc=\"Fence agent for HP iLO3\"/>\n");
+  printf("<symlink name=\"fence_ilo4\" shortdesc=\"Fence agent for HP iLO4\"/>\n");
   printf("<symlink name=\"fence_idrac\" shortdesc=\"Fence agent for Dell iDRAC\"/>\n");
   printf("<symlink name=\"fence_imm\" shortdesc=\"Fence agent for IBM Integrated Management Module\"/>\n");  
   printf("<longdesc>\n");
@@ -985,6 +986,8 @@ main(int argc, char **argv)
 		lanplus = 1;
 		down_sleep = 4;
 		strncpy(method, "cycle\0", 6);
+        } else if (!strcmp(pname, "fence_ilo4")) {
+		lanplus = 1;
         }
 
 	if (argc > 1) {


More information about the cluster-commits mailing list