From 1cc16b35d1e365f3763d11feec7bc783a9d5f1c7 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@epfl.ch>
Date: Fri, 19 Jan 2018 09:43:12 +0000
Subject: [PATCH] Ensure node-specific configuration is always used

Some settings where by-passed when using the keyword all.

There is still one setting which might be ignored when using the all
keyword:

   EXAREME_ROLE

   It is assumed the Swarm function is the same at the federation level,
   and this is used to compute the number of worker nodes, thus it is
   required to keep this information in synchronised.
---
 start.sh | 31 ++++++++++++++++++++++++-------
 stop.sh  |  6 ++++--
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/start.sh b/start.sh
index 08a2894..bf0b434 100755
--- a/start.sh
+++ b/start.sh
@@ -17,8 +17,6 @@
 # DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 # USE OF THIS SOFTWARE.
 
-. ./settings.sh
-
 federation_nodes=""
 federation_hosts=""
 for h in $(docker node ls --format '{{ .Hostname }}')
@@ -28,6 +26,10 @@ do
 done
 
 usage() {
+	( # This is just in case the user wants to check the settings
+		. ./settings.sh
+	)
+
 	cat <<EOT
 usage: $0 [-h|--help] (all|nodename [nodename ...])
 	-h, --help: show this message and exit
@@ -54,6 +56,8 @@ start_node() {
 		LDSM_HOST=$2
 		EXAREME_ROLE=$3
 
+		. ./settings.sh ${FEDERATION_NODE}
+
 		# Export the settings to the docker-compose files
 		export FEDERATION_NODE
 
@@ -104,17 +108,28 @@ start_nodes() {
 	for h in ${managers}
 	do
 		label=$(docker node inspect --format '{{ .Spec.Labels.name }}' ${h})
-		dbhost=$(docker node inspect --format '{{ .Status.Addr }}' ${h})
-		EXAREME_WORKERS_WAIT=$(echo "$workers" | wc -w)
-		start_node ${label} ${dbhost} manager
+		(
+			# Retrieve LDSM_HOST if it has been set manually.
+			SHOW_SETTINGS=false . ./settings.sh ${label}
+			test -z "${LDSM_HOST}" && \
+				LDSM_HOST=$(docker node inspect --format '{{ .Status.Addr }}' ${h})
+			EXAREME_WORKERS_WAIT=$(echo "$workers" | wc -w)
+			start_node ${label} ${LDSM_HOST} manager
+		)
 	done
 
 	# Then start all the worker nodes
 	for h in ${workers}
 	do
 		label=$(docker node inspect --format '{{ .Spec.Labels.name }}' ${h})
-		dbhost=$(docker node inspect --format '{{ .Status.Addr }}' ${h})
-		start_node ${label} ${dbhost} worker
+		(
+			# Retrieve LDSM_HOST if it has been set manually.
+			SHOW_SETTINGS=false . ./settings.sh ${label}
+			test -z "${LDSM_HOST}" && \
+				LDSM_HOST=$(docker node inspect --format '{{ .Status.Addr }}' ${h})
+
+			start_node ${label} ${LDSM_HOST} worker
+		)
 	done
 }
 
@@ -128,6 +143,8 @@ start_one_node() {
 		label=$(docker node inspect --format '{{ .Spec.Labels.name }}' ${h})
 		if [ "x${label}" == "x${FEDERATION_NODE}" ];
 		then
+			# Retrieve LDSM_HOST, EXAREME_ROLE if they have been set manually.
+			SHOW_SETTINGS=false . ./settings.sh ${label}
 			test -z "${LDSM_HOST}" && \
 				LDSM_HOST=$(docker node inspect --format '{{ .Status.Addr }}' ${h})
 
diff --git a/stop.sh b/stop.sh
index 7341528..69ad702 100755
--- a/stop.sh
+++ b/stop.sh
@@ -17,8 +17,6 @@
 # DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 # USE OF THIS SOFTWARE.
 
-. ./settings.sh
-
 federation_nodes=""
 federation_hosts=""
 for h in $(docker node ls --format '{{ .Hostname }}')
@@ -28,6 +26,10 @@ do
 done
 
 usage() {
+	( # This is just in case the user wants to check the settings
+		. ./settings.sh
+	)
+
 	cat <<EOT
 usage: $0 [-h|--help] (all|nodename [nodename ...])
 	-h, --help: show this message and exit