Yaniv Bronhaim has uploaded a new change for review.

Change subject: Fail pre-start run after configure libvirt
......................................................................

Fail pre-start run after configure libvirt

After configuring libvirt we should restart libvirtd manually. If
vdsm continues to next pre-start tasks (as nwfilter that requires
communication to libvirtd socket) it will fail, and that will lead to
fail in vdsmd start. This patch stops the pre-start run after configure.

This patch is relevant only when using the deprecated
"vdsm-tool libvirt-configure" verb which was modified to "vdsm-tool configure".

Change-Id: I8216f9556e6ef4df96977db494c5b5169bfae80a
Bug-Url: [TBD]
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M init/vdsmd_init_common.sh.in
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/21356/1

diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index 89c60e9..2f62827 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -55,7 +55,8 @@
 
 
 task_reconfigure_libvirt(){
-    "$VDSM_TOOL" libvirt-configure
+    "$VDSM_TOOL" libvirt-configure | grep -q 'To start working' && return 1
+    return 0
 }
 
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8216f9556e6ef4df96977db494c5b5169bfae80a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to