From: Michael Adam <obnox@samba.org>
Date: Thu, 26 Nov 2015 10:17:04 +0000 (+0100)
Subject: Externalize ctdb-create-nodes provision script
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7c85e2f127e3cdefe41ec765adfd739988bd2b51;p=obnox%2Fvagrant%2Fvagrant-gluster-samba-cluster.git

Externalize ctdb-create-nodes provision script

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/Vagrantfile b/Vagrantfile
index 2a2fb18..6a9405c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -203,24 +203,6 @@ ifup eth1
 SCRIPT
 
 
-CTDB_CREATE_NODES_SCRIPT = <<SCRIPT
-set -e
-
-BACKUP_SUFFIX=".orig.$(date +%Y%m%d-%H%M%S)"
-
-NODES_IPS="$@"
-
-FILE=/etc/ctdb/nodes
-test -f ${FILE} || touch ${FILE}
-cp -f -a ${FILE} ${FILE}${BACKUP_SUFFIX}
-
-echo -n > ${FILE}
-for IP in ${NODES_IPS}
-do
-  echo "$IP" >> ${FILE}
-done
-SCRIPT
-
 CTDB_CREATE_PUBADDRS_SCRIPT = <<SCRIPT
 set -e
 
@@ -452,7 +434,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end
 
       node.vm.provision "ctdb_create_nodes", type: "shell" do |s|
-        s.inline = CTDB_CREATE_NODES_SCRIPT
+        s.path = "provision/shell/ctdb/ctdb-create-nodes.sh"
         s.args = cluster_internal_ips
       end
 
diff --git a/provision/shell/ctdb/ctdb-create-nodes.sh b/provision/shell/ctdb/ctdb-create-nodes.sh
new file mode 100755
index 0000000..1df0597
--- /dev/null
+++ b/provision/shell/ctdb/ctdb-create-nodes.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+BACKUP_SUFFIX=".orig.$(date +%Y%m%d-%H%M%S)"
+
+NODES_IPS="$@"
+
+FILE=/etc/ctdb/nodes
+test -f ${FILE} || touch ${FILE}
+cp -f -a ${FILE} ${FILE}${BACKUP_SUFFIX}
+
+echo -n > ${FILE}
+for IP in ${NODES_IPS}
+do
+  echo "$IP" >> ${FILE}
+done