[node-patches] Change in ovirt-node[master]: Move hook execution to ovirt-post

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Move hook execution to ovirt-post
......................................................................

Move hook execution to ovirt-post

Now that some of the hooks are starting or restarting services,
move hook execution later in the startup order so we don't get
into a circular ordering problem with the services we're waiting
for.

Change-Id: I6780f815064ed4170da5c8b391fb944090746693
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1192523
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1199019
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
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/80/38680/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index f142e18..5e0d0ce 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1019,15 +1019,6 @@
 firewall.process_plugins()
 EOP
 
-    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
-
     return 0
 }
 
@@ -1363,6 +1354,15 @@
 # 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"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6780f815064ed4170da5c8b391fb944090746693
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>