Export settings, instead of just defining variables

settings.sh

@@ -22,9 +22,18 @@ fi
 if ${SHOW_SETTINGS};
 then
 	echo "Current settings:"
-	for v in $(grep '^:' settings.default.sh|cut -c 5- |cut -d: -f1)
-	do
+fi
+
+for v in $(grep '^:' settings.default.sh|cut -c 5- |cut -d: -f1)
+do
+	eval "export $v=\"\$$v\""
+	if ${SHOW_SETTINGS};
+	then
 		eval "echo $v=\$$v"
-	done
+	fi
+done
+
+if ${SHOW_SETTINGS};
+then
 	echo
 fi

start.sh

@@ -58,16 +58,6 @@ start_node() {
 
 		. ./settings.sh ${FEDERATION_NODE}
 
-		# Export the settings to the docker-compose files
-		export FEDERATION_NODE
-
-		export LDSM_USERNAME LDSM_PASSWORD LDSM_HOST LDSM_PORT LDSM_DB
-
-		export CONSUL_IMAGE CONSUL_VERSION
-		export EXAREME_IMAGE EXAREME_VERSION
-		export EXAREME_ROLE EXAREME_KEYSTORE EXAREME_MODE EXAREME_WORKERS_WAIT
-		export EXAREME_LDSM_ENDPOINT EXAREME_LDSM_RESULTS EXAREME_LDSM_DATAKEY
-
 		# Finally deploy the stack
 		docker stack deploy -c docker-compose-${EXAREME_ROLE}.yml ${FEDERATION_NODE}
 	)