Yaniv Bronhaim has uploaded a new change for review. Change subject: avoid changing running libvirtd with upstart when running over node ......................................................................
avoid changing running libvirtd with upstart when running over node node doesn't install libvirt doc files. libvirtd.upstart is a sample file which part of libvirt docs. Because its currently missing this patch avoid checking that. Change-Id: I065d5e885301bf2899daaa9976dc32635dfc322e Signed-off-by: Yaniv Bronhaim <[email protected]> --- M lib/vdsm/tool/configurators/libvirt.py 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/41574/1 diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index 8dc9831..6f34703 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -97,16 +97,20 @@ if not self._openConfig(path).hasConf(): ret = NOT_CONFIGURED - # hack for rhbz#1222154: we need to check whether we have forgotten to - # disabled libvirtd's sysv service. If chkconfig returns 0, it means + # #1 hack for rhbz#1222154: we need to check whether we have forgotten + # to disabled libvirtd's sysv service. If chkconfig returns 0, it means # that sysv would run libvirtd. If chkconfig returns 1 or does not # exist (el7, fedora, debian), all is well. - if hasattr(service, 'chkconfigList'): - try: - if service.chkconfigList('libvirtd'): - ret = NOT_CONFIGURED - except service.ServiceNotExistError: - pass + + # #2 hack: ovirt node we doesn't install upstarts file, so avoid + # this check until having it installed properly + if not utils.isOvirtNode(): + if hasattr(service, 'chkconfigList'): + try: + if service.chkconfigList('libvirtd'): + ret = NOT_CONFIGURED + except service.ServiceNotExistError: + pass if ret == NOT_SURE: sys.stdout.write("libvirt is already configured for vdsm\n") -- To view, visit https://gerrit.ovirt.org/41574 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I065d5e885301bf2899daaa9976dc32635dfc322e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
