Zhou Zheng Sheng has posted comments on this change. Change subject: Extend vdsm-tool: moving configure libvirt to external shell script ......................................................................
Patch Set 4: I would prefer that you didn't submit this (2 inline comments) -1 for asking some questions... .................................................... File lib/vdsm/tool/libvirt_configure.sh.in Line 145: ! [ -f "$FORCE_RECONFIGURE" ] && Line 146: grep -q "$by_vdsm_vers" $lconf && grep -q "$by_vdsm_vers" $qconf && \ Line 147: grep -q "$by_vdsm_vers" $ldconf && grep -q "$by_vdsm_vers" $qlconf Line 148: then Line 149: echo "libvirt is already configured for vdsm" Should it be tab or space? Line 150: return 0 Line 151: fi Line 152: Line 153: echo $"Configuring libvirt for vdsm..." .................................................... File vdsm/vdsmd.init.in Line 39: Line 40: LCONF=/etc/libvirt/libvirtd.conf Line 41: QCONF=/etc/libvirt/qemu.conf Line 42: LDCONF=/etc/sysconfig/libvirtd Line 43: QLCONF=/etc/libvirt/qemu-sanlock.conf No other code refer to LDCONF and QLCONF, so they can be removed from vdsmd.init . LCONF and QCONF are still used in function test_conflicting_conf(). Ideally LCONF, QCONF and test_conflicting_conf() should be moved to libvirt_configure.sh as well, then we can invoke them like this. vdsm-tool libvirt-configure force -> libvirt_configure.sh reconfigure force vdsm-tool libvirt-configure noforce -> libvirt_configure.sh reconfigure noforce vdsm-tool libvirt-configure -> libvirt_configure.sh reconfigure vdsm-tool libvirt-test-conflicting-conf -> libvirt_configure.sh test_conflicting_conf This reveals a cleaner vdsmd.init, and all the path variables are maintained in one file. In libvirt_configure.sh, we can examine $1 to see what need to be done(reconfigure or test_conflicting_conf). Then it shift the first argument, and passthru the rest of the arguments "$@" to the related functions. What do you think? Line 44: Line 45: is_coredump=`$GETCONFITEM $CONF_FILE vars core_dump_enable false | tr A-Z a-z` Line 46: [ "$is_coredump" != "true" ] && is_coredump=false Line 47: -- To view, visit http://gerrit.ovirt.org/15216 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id58b129afbf141a47a85b421961bf5b1776b41e4 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> Gerrit-Reviewer: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Yaniv Bronhaim <[email protected]> Gerrit-Reviewer: Zhou Zheng Sheng <[email protected]> Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
