From cd48169fb00842682f4310531acd7828fa15190d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 26 Nov 2015 11:06:34 +0100
Subject: [PATCH] Externalize gluster-wait-peers provision script.

Signed-off-by: Michael Adam <obnox@samba.org>
---
 Vagrantfile                                   | 27 +------------------
 provision/shell/gluster/gluster-wait-peers.sh | 22 +++++++++++++++
 2 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100755 provision/shell/gluster/gluster-wait-peers.sh

diff --git a/Vagrantfile b/Vagrantfile
index f4ee89d..fd1fb65 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -202,31 +202,6 @@ ifdown eth1
 ifup eth1
 SCRIPT
 
-
-GLUSTER_WAIT_PEERS_SCRIPT = <<SCRIPT
-set -e
-
-NUM_NODES="$1"
-TIMEOUT=$2
-
-echo "Waiting for $NUM_NODES peers."
-
-for count in $(seq 1 ${TIMEOUT})
-do
-  PEERS=$(gluster pool list | grep -v ^UUID | wc -l)
-  [ "$PEERS" = "$NUM_NODES" ] && {
-    echo "Done waiting: $NUM_NODES peers connected."
-    exit 0
-  } || {
-    sleep 1
-  }
-done
-
-echo "TIMEOUT waiting for $NUM_NODES peers."
-exit 1
-
-SCRIPT
-
 GLUSTER_CREATEVOL_SCRIPT = <<SCRIPT
 #set -e
 
@@ -566,7 +541,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end
 
       node.vm.provision "gluster_wait_peers", type: "shell" do |s|
-        s.inline = GLUSTER_WAIT_PEERS_SCRIPT
+        s.path = "provision/shell/gluster/gluster-wait-peers.sh"
         s.args = [ cluster_internal_ips.length, 300]
       end
 
diff --git a/provision/shell/gluster/gluster-wait-peers.sh b/provision/shell/gluster/gluster-wait-peers.sh
new file mode 100755
index 0000000..a629df8
--- /dev/null
+++ b/provision/shell/gluster/gluster-wait-peers.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+NUM_NODES="$1"
+TIMEOUT=$2
+
+echo "Waiting for $NUM_NODES peers."
+
+for count in $(seq 1 ${TIMEOUT})
+do
+  PEERS=$(gluster pool list | grep -v ^UUID | wc -l)
+  [ "$PEERS" = "$NUM_NODES" ] && {
+    echo "Done waiting: $NUM_NODES peers connected."
+    exit 0
+  } || {
+    sleep 1
+  }
+done
+
+echo "TIMEOUT waiting for $NUM_NODES peers."
+exit 1
-- 
2.34.1