[node-patches] Change in ovirt-node[master]: init: Move the on-boot hook to the end of post

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: init: Move the on-boot hook to the end of post
......................................................................

init: Move the on-boot hook to the end of post

This shall ensure that all node specific stuff is done, and any async
hook does not interfer with any following ovirt-post-logic.

The specific case is that vdsm get#s started async in the 90-start-vdsm
handler, this could interfer with the (necessary) service network
restart call, because the networking will change while vdsm comes up.

Change-Id: I2b3937fb248bf0487cc0db7702d5423f1eca9d79
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1194068
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/79/38979/2

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index a3ff1ab..88efd20 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1358,15 +1358,6 @@
 # ovirt-post
 #
 start_ovirt_post() {
-    if [[ -d "$HOOK_ON_BOOT_DIR" ]] && [[ "$(ls -A $HOOK_ON_BOOT_DIR)" ]];
-    then
-        for handler in "$HOOK_ON_BOOT_DIR"/*;
-        do
-            log "Running handler: $handler"
-            "$handler" >> $OVIRT_LOGFILE 2>&1
-        done
-    fi
-
     [ -f "$VAR_SUBSYS_OVIRT_POST" ] && exit 0
     {
         log "Starting ovirt-post"
@@ -1522,6 +1513,15 @@
         case $OVIRT_RUNTIME_MODE in
         esac
 
+        if [[ -d "$HOOK_ON_BOOT_DIR" ]] && [[ "$(ls -A $HOOK_ON_BOOT_DIR)" ]];
+        then
+            for handler in "$HOOK_ON_BOOT_DIR"/*;
+            do
+                log "Running handler: $handler"
+                "$handler" >> $OVIRT_LOGFILE 2>&1
+            done
+        fi
+
         rm -f $VAR_SUBSYS_OVIRT_POST
 
         log "Completed ovirt-post"


-- 
To view, visit https://gerrit.ovirt.org/38979
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b3937fb248bf0487cc0db7702d5423f1eca9d79
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: automation at ovirt.org