fence_scsi: port to fencing library

PATCH New Ondrej Mular 1 participant 2 messages May 2, 2014 – May 12, 2014 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Ondrej Mular

author

2014-05-02 11:15 UTC #1 lore raw

PATCH 2/3 fence_scsi: port to fencing library

---
 configure.ac                          |   8 +
 fence/agents/scsi/Makefile.am         |  20 +-
 fence/agents/scsi/fence_scsi.8        | 119 -----
 fence/agents/scsi/fence_scsi.pl       | 875 ----------------------------------
 fence/agents/scsi/fence_scsi.py       | 444 +++++++++++++++++
 fence/agents/scsi/fence_scsi_check.pl | 170 -------
 make/fencebuild.mk                    |   4 +
 7 files changed, 467 insertions(+), 1173 deletions(-)
 delete mode 100644 fence/agents/scsi/fence_scsi.8
 delete mode 100644 fence/agents/scsi/fence_scsi.pl
 create mode 100644 fence/agents/scsi/fence_scsi.py
 delete mode 100644 fence/agents/scsi/fence_scsi_check.pl

configure.ac +8 -0

index c24198c..c4e38f1 100644
@@ -163,6 +163,10 @@ CLUSTERDATA=${datadir}/cluster
 AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
 AC_PATH_PROG([AMTTOOL_PATH], [amttool], [/usr/bin/amttool])
 AC_PATH_PROG([GNUTLSCLI_PATH], [gnutlscli], [/usr/bin/gnutls-cli])
+AC_PATH_PROG([COROSYNC_CMAPCTL_PATH], [corosync-cmapctl], [/usr/sbin/corosync-cmapctl])
+AC_PATH_PROG([SG_PERSIST_PATH], [sg_persist], [/usr/bin/sg_persist])
+AC_PATH_PROG([SG_TURS_PATH], [sg_turs], [/usr/bin/sg_turs])
+AC_PATH_PROG([VGS_PATH], [vgs], [/usr/sbin/vgs])
 ## do subst
 
 AC_SUBST([DEFAULT_CONFIG_DIR])

@@ -189,6 +193,10 @@ AM_CONDITIONAL(BUILD_XENAPILIB, test $XENAPILIB -eq 1)
 
 AC_SUBST([IPMITOOL_PATH])
 AC_SUBST([AMTTOOL_PATH])
+AC_SUBST([COROSYNC_CMAPCTL_PATH])
+AC_SUBST([SG_PERSIST_PATH])
+AC_SUBST([SG_TURS_PATH])
+AC_SUBST([VGS_PATH])
 
 ## *FLAGS handling

fence/agents/scsi/Makefile.am +11 -9

index 5652bda..896406a 100644
@@ -2,20 +2,22 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 TARGET			= fence_scsi
 
-SRC			= $(TARGET).pl
+SYMTARGET		= fence_scsi_check
 
-EXTRA_DIST		= $(SRC) \
-			  $(TARGET)_check.pl 
+SRC			= $(TARGET).py
 
-scsidatadir		= $(CLUSTERDATA)
+EXTRA_DIST		= $(SRC)
 
-scsidata_SCRIPTS	= $(TARGET)_check.pl
+sbin_SCRIPTS		= $(TARGET) $(SYMTARGET)
 
-sbin_SCRIPTS		= $(TARGET)
+man_MANS		= $(TARGET).8
 
-dist_man_MANS		= $(TARGET).8
+$(SYMTARGET): $(TARGET)
+	ln -s $^ $@
 
 include $(top_srcdir)/make/fencebuild.mk
+include $(top_srcdir)/make/fenceman.mk
+include $(top_srcdir)/make/agentpycheck.mk
 
-clean-local:
-	rm -f $(TARGET)
+clean-local: clean-man
+	rm -f $(TARGET) $(SYMTARGET)

fence/agents/scsi/fence_scsi.8 deleted +0 ~~-119~~

119 lines not on this page · raw message

fence/agents/scsi/fence_scsi.pl deleted +0 ~~-875~~

875 lines not on this page · raw message

fence/agents/scsi/fence_scsi.py new file +444 -0

444 lines not on this page · raw message

fence/agents/scsi/fence_scsi_check.pl deleted +0 ~~-170~~

170 lines not on this page · raw message

make/fencebuild.mk +4 -0

index 819ac36..1c4be6b 100644
@@ -12,6 +12,10 @@ $(TARGET): $(SRC)
 		-e 's#@''IPMITOOL_PATH@#${IPMITOOL_PATH}#g' \
 		-e 's#@''AMTTOOL_PATH@#${AMTTOOL_PATH}#g' \
 		-e 's#@''GNUTLSCLI_PATH@#${GNUTLSCLI_PATH}#g' \
+		-e 's#@''COROSYNC_CMAPCTL_PATH@#${COROSYNC_CMAPCTL_PATH}#g' \
+		-e 's#@''SG_PERSIST_PATH@#${SG_PERSIST_PATH}#g' \
+		-e 's#@''SG_TURS_PATH@#${SG_TURS_PATH}#g' \
+		-e 's#@''VGS_PATH@#${VGS_PATH}#g' \
 	> $@
 
 	if [ 0 -eq `echo "$(SRC)" | grep fence_ &> /dev/null; echo $$?` ]; then \

Signature · 1 line

1.8.3.1