Merge branch 'master' of github.com:ClusterLabs/fence-agents

Author: beekhof

.gitignore

@@ -20,7 +20,11 @@ libtoolize
 ltmain.sh
 libtool
 make/stamp-h1
-m4
+
+# ignore "libtoolized" m4 files, but keep our (enumerated) ones
+/m4/*
+!/m4/ac_python_module.m4
+
 make/clusterautoconfig.h*
 missing
 *.pc

Makefile.am

@@ -42,5 +42,8 @@ gen-ChangeLog:
 		mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
 
+# this will get rid of "libtoolized" m4 files
 maintainer-clean-local:
-	rm -rf m4
+	rm -rf $(filter-out \
+	         $(top_srcdir)/m4/ac_python_module.m4,$(wildcard \
+		                                        $(top_srcdir)/m4/*.m4))

autogen.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
-mkdir -p m4
+# ("-I make" is superfluous, kept only for legacy purposes, if any)
 autoreconf -i -I make -v && echo Now run ./configure and make

configure.ac

@@ -163,6 +163,7 @@ AC_PYTHON_MODULE(suds, 1)
 AC_PYTHON_MODULE(pexpect, 1)
 AC_PYTHON_MODULE(pycurl, 1)
 AC_PYTHON_MODULE(requests, 1)
+AC_PYTHON_MODULE(pywsman, 1)
 
 ## path to 3rd-party binaries
 AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
@@ -182,6 +183,7 @@ AC_PATH_PROG([SNMPWALK_PATH], [snmpwalk], [/usr/bin/snmpwalk])
 AC_PATH_PROG([SNMPSET_PATH], [snmpset], [/usr/bin/snmpset])
 AC_PATH_PROG([SNMPGET_PATH], [snmpget], [/usr/bin/snmpget])
 AC_PATH_PROG([NOVA_PATH], [nova], [/usr/bin/nova])
+AC_PATH_PROG([POWERMAN_PATH], [powerman], [/usr/bin/powerman])
 
 ## do subst
 
@@ -213,6 +215,7 @@ AC_SUBST([COROSYNC_CMAPCTL_PATH])
 AC_SUBST([SG_PERSIST_PATH])
 AC_SUBST([SG_TURS_PATH])
 AC_SUBST([VGS_PATH])
+AC_SUBST([POWERMAN_PATH])
 
 ## *FLAGS handling
 

fence/agents/Makefile.am

@@ -4,9 +4,9 @@ TARGET				= $(AGENTS_LIST:%.py=%)
 
 SRC				= $(TARGET:=.py)
 
-CLEAN_TARGET_ADDITIONAL		= kdump/fence_kdump_send
+CLEAN_TARGET_ADDITIONAL		= kdump/fence_kdump_send manual/fence_ack_manual */*.o
 
-EXTRA_DIST			= $(SRC)
+EXTRA_DIST			= $(SRC) manual/fence_ack_manual.in manual/fence_ack_manual.8 zvm/fence_zvm_man_page
 
 sbin_SCRIPTS			= $(TARGET) manual/fence_ack_manual
 
@@ -17,21 +17,21 @@ man_MANS			= $(sbin_SCRIPTS:=.8)
 sbin_PROGRAMS			= kdump/fence_kdump zvm/fence_zvm
 libexec_PROGRAMS		= kdump/fence_kdump_send
 
-noinst_HEADERS			= kdump/list.h kdump/message.h kdump/options.h kdump/version.h
+noinst_HEADERS			= kdump/list.h kdump/message.h kdump/options.h kdump/version.h zvm/fence_zvm.h
 
 kdump_fence_kdump_SOURCES	= kdump/fence_kdump.c
 kdump_fence_kdump_CFLAGS	= -D_GNU_SOURCE -Ikdump
 
 kdump_fence_kdump_send_SOURCES	= kdump/fence_kdump_send.c
 kdump_fence_kdump_send_CFLAGS	= -D_GNU_SOURCE -Ikdump
 
-dist_man_MANS			= kdump/fence_kdump.8 kdump/fence_kdump_send.8
+dist_man_MANS			= kdump/fence_kdump.8 kdump/fence_kdump_send.8 zvm/fence_zvm.8
 
 scsidatadir			= $(CLUSTERDATA)
 scsidata_SCRIPTS		= scsi/fence_scsi_check scsi/fence_scsi_check_hardreboot
 
 zvm_fence_zvm_SOURCES		= zvm/fence_zvm.c
-zvm_fence_zvm_CFLAGS		= -D_GNU_SOURCE
+zvm_fence_zvm_CFLAGS		= -D_GNU_SOURCE -Izvm
 
 FENCE_TEST_ARGS			= \
 login=test\n\
@@ -44,6 +44,7 @@ session_url=http://test\n\
 [email protected]
 
 manual/fence_ack_manual: manual/fence_ack_manual.in
+	mkdir -p $(@D)
 	cat $^ | sed \
 		-e 's#@clustervarrun@#${CLUSTERVARRUN}#g' \
 	> $@

fence/agents/alom/Makefile.am

@@ -14,7 +14,7 @@
 ##        cipher (des/blowfish) have to be defined
 #####
 
-import sys, re
+import sys, re, time
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
@@ -26,6 +26,10 @@
 BUILD_DATE="March, 2008"
 #END_VERSION_GENERATION
 
+# Fix for connection timed out issue in:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1342584
+TIMEDOUT_DELAY = 0.5
+
 def get_power_status(conn, options):
 	exp_result = 0
 	outlets = {}
@@ -78,6 +82,7 @@ def get_power_status(conn, options):
 			res = show_re.search(line)
 			if res != None:
 				outlets[res.group(2)] = (res.group(3), res.group(4))
+		time.sleep(TIMEDOUT_DELAY)
 		conn.send_eol("")
 		if exp_result != 0:
 			break
@@ -151,6 +156,7 @@ def set_power_status(conn, options):
 
 	while 0 == conn.log_expect(
 			["Press <ENTER>"] + options["--command-prompt"], int(options["--shell-timeout"])):
+		time.sleep(TIMEDOUT_DELAY)
 		conn.send_eol("")
 
 	conn.send_eol(options["--plug"]+"")
@@ -171,6 +177,7 @@ def set_power_status(conn, options):
 	conn.log_expect("Enter 'YES' to continue or <ENTER> to cancel :", int(options["--shell-timeout"]))
 	conn.send_eol("YES")
 	conn.log_expect("Press <ENTER> to continue...", int(options["--power-timeout"]))
+	time.sleep(TIMEDOUT_DELAY)
 	conn.send_eol("")
 	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
 	conn.send(chr(0o3))