Change in vdsm[master]: Supervdsm as external service

zhshzhou at linux.vnet.ibm.com zhshzhou at linux.vnet.ibm.com
Thu May 23 08:47:12 UTC 2013


Zhou Zheng Sheng has posted comments on this change.

Change subject: Supervdsm as external service
......................................................................


Patch Set 9: (2 inline comments)

....................................................
File configure.ac
Line 189: AC_PATH_PROG([UNPERSIST_PATH], [unpersist], [/usr/sbin/unpersist])
Line 190: AC_PATH_PROG([WGET_PATH], [wget], [/usr/bin/wget])
Line 191: AC_PATH_PROG([YUM_PATH], [yum], [/usr/bin/yum])
Line 192: AC_PATH_PROG([VDSM_TOOL], [vdsm-tool], [/usr/bin/vdsm-tool])
Line 193: 
In vdsm-tool/Makefile.am, vdsm-tool is a element of dist_bin_SCRIPTS list. The packaging system will install it to $(bindir). $(bindir) is a variable available in Makefile. The default bindir value is ${prefix}/bin, and can be overridden by make bindir=/xxx .

To use the installed vdsm-tool path defined by the packaging system in constants.py.in, I test the following solution and it works.

In build-aux/Makefile.subs, add

PATHSUBST = sed \
	...
	-e "s,[@]BINDIR[@],$(bindir),g" \
	...

In configure.ac, delete "AC_PATH_PROG([VDSM_TOOL] ..."

In lib/vdsm/constants.py.in, define

 EXT_VDSM_TOOL = os.path.join('@BINDIR@', 'vdsm-tool')
Line 194: # Keep sorted
Line 195: AC_OUTPUT([
Line 196: 	Makefile
Line 197: 	client/Makefile


....................................................
File vdsm/sudoers.vdsm.in
Line 32:     @CP_PATH@ /etc/multipath.conf *, \
Line 33:     @CP_PATH@ * /etc/multipath.conf, \
Line 34:     @MULTIPATH_PATH@, \
Line 35:     @SETSID_PATH@ @IONICE_PATH@ -c ? -n ? @SU_PATH@ vdsm -s /bin/sh -c /usr/libexec/vdsm/spmprotect.sh*, \
Line 36:     @VDSM_TOOL@ service-restart supervdsmd, \
If you apply the solution suggested in configure.ac, this line shall be:

 @BINDIR@/vdsm-tool service-restart supervdsmd, \
Line 37:     @REBOOT_PATH@ -f, \
Line 38:     @PYTHON@ @VDSMDIR@/supervdsmServer.py* [a-z0-9\\-]* [0-9]*
Line 39: 
Line 40: vdsm  ALL=(ALL) NOPASSWD: VDSM_LIFECYCLE, VDSM_STORAGE


--
To view, visit http://gerrit.ovirt.org/11051
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I290a584f38129406cd390fdd1d3d1aad9f829a60
Gerrit-PatchSet: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Adam Litke <agl at us.ibm.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw at linux.vnet.ibm.com>
Gerrit-Reviewer: Mei Liu <liumbj at linux.vnet.ibm.com>
Gerrit-Reviewer: Ohad Basan <obasan at redhat.com>
Gerrit-Reviewer: Royce Lv <lvroyce at linux.vnet.ibm.com>
Gerrit-Reviewer: Timothy Asir <tjeyasin at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list