Fix load of Minio env variables in installation scripts

Change-Id: I2b76b7834a551ab5e8af0e278c92ee851e45ed19
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc
index 9afcf70..eac6569 100644 (file)
--- a/installers/00-default-install-options.rc
+++ b/installers/00-default-install-options.rc
@@ -46,4 +46,5 @@ export KUBECONFIG_OSM_CLUSTER=
 export OSM_BEHIND_PROXY=
 export OPENSHIFT_MGMT_CLUSTER=
 export MGMT_CLUSTER_CA_FILE=
-export OSM_K8S_NGINX_IPADDRESS=
\ No newline at end of file
+export OSM_K8S_NGINX_IPADDRESS=
+

diff --git a/installers/10-install-client-tools.sh b/installers/10-install-client-tools.sh
index 1d8c86f..5a02e70 100755 (executable)
--- a/installers/10-install-client-tools.sh
+++ b/installers/10-install-client-tools.sh
@@ -21,7 +21,9 @@ source "${HERE}/../library/trap.sh"
 source "${HERE}/../library/logging"
 source "${HERE}/../library/track"
 
-INSTALL_MINIO=${INSTALL_MINIO:-"y"}
+source "${HERE}/00-default-install-options.rc"
+[ ! -f "${OSM_HOME_DIR}/user-install-options.rc" ] || source "${OSM_HOME_DIR}/user-install-options.rc"
+
 echo "INSTALL_MINIO=$INSTALL_MINIO"
 
 pushd $HOME

diff --git a/installers/20-deploy-aux-svc-cluster.sh b/installers/20-deploy-aux-svc-cluster.sh
index 3faca66..27caa84 100755 (executable)
--- a/installers/20-deploy-aux-svc-cluster.sh
+++ b/installers/20-deploy-aux-svc-cluster.sh
@@ -96,7 +96,6 @@ m "\n#####################################################################" "${C
 m "(3/3) Installing Minio..." "${CYAN}"
 m "#####################################################################\n" "${CYAN}"
 
-INSTALL_MINIO=${INSTALL_MINIO:-"y"}
 echo "INSTALL_MINIO=$INSTALL_MINIO"
 if [ -n "${INSTALL_MINIO}" ]; then
     # Enter the Minio folder