From 2b4cd1fefb830483c026d6f085dd479aded4be25 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 8 Aug 2025 10:02:01 +0200 Subject: [PATCH] Fix load of Minio env variables in installation scripts Change-Id: I2b76b7834a551ab5e8af0e278c92ee851e45ed19 Signed-off-by: garciadeblas --- installers/00-default-install-options.rc | 3 ++- installers/10-install-client-tools.sh | 4 +++- installers/20-deploy-aux-svc-cluster.sh | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc index 9afcf70b..eac65698 100644 --- 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 1d8c86f0..5a02e702 100755 --- 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 3faca664..27caa84a 100755 --- 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 -- 2.25.1