From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 21 Aug 2018 20:48:10 +0000 (+0200)
Subject: Also ask our nagios check if drbd is fine
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5f6e8eec603529861ba513956336904de0acc710;hp=0adb07cb5fb5c115b6fc2ad5686857ca48159b4e;p=mirror%2Fdsa-puppet.git

Also ask our nagios check if drbd is fine
---

diff --git a/modules/ganeti2/files/ganeti-reboot-cluster b/modules/ganeti2/files/ganeti-reboot-cluster
index 383eb7ae1..bc95de334 100755
--- a/modules/ganeti2/files/ganeti-reboot-cluster
+++ b/modules/ganeti2/files/ganeti-reboot-cluster
@@ -214,7 +214,7 @@ crossmigrate() {
   if [ -e /proc/drbd ]; then
     echo "Waiting for drbd to be consistent."
     sleep 5
-    while egrep -C2 --color -i 'iconsistent|finish' /proc/drbd; do
+    while egrep -C2 --color -i 'iconsistent|finish' /proc/drbd || ! /usr/lib/nagios/plugins/dsa-check-drbd -d All ; do
       echo "Still waiting.."
       sleep 5
     done