From 31dd8bb63fee32f81b8e804eae5a9f278b4e37db Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 8 Jul 2025 14:54:24 +0200 Subject: [PATCH] Fix export of user install options User options in the installer were wrongly overridden by the default install options after reading them, which led to undesired behaviour. Change-Id: I49be0921706ed6ed58ea874957d164e26d86d4ad Signed-off-by: garciadeblas --- installers/01-export-osm-install-options.sh | 2 ++ installers/full_install_osm.sh | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/installers/01-export-osm-install-options.sh b/installers/01-export-osm-install-options.sh index 4f2ed185..963c9246 100755 --- a/installers/01-export-osm-install-options.sh +++ b/installers/01-export-osm-install-options.sh @@ -62,5 +62,7 @@ export KUBECONFIG_OSM_CLUSTER=${KUBECONFIG_OSM_CLUSTER} export OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY} EOF +cat "${OSM_HOME_DIR}/user-install-options.rc" + m "Done." echo diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index c1169cc8..35a9d9eb 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -46,8 +46,9 @@ function usage(){ HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")") OSM_DEVOPS="${OSM_DEVOPS:-"${HERE}/.."}" source $OSM_DEVOPS/library/all_funcs -source $OSM_DEVOPS/installers/00-default-install-options.rc +echo "Load default options and export user installation options" +source $OSM_DEVOPS/installers/00-default-install-options.rc RE_CHECK='^[a-z0-9]([-a-z0-9]*[a-z0-9])?$' while getopts ":a:c:e:r:k:u:R:D:s:t:U:d:p:T:M:G:O:-: hy" o; do @@ -180,8 +181,6 @@ setup_external_ip track prereq prereqok_ok # Export installation options -echo "Load default options and export user installation options" -source $OSM_DEVOPS/installers/00-default-install-options.rc $OSM_DEVOPS/installers/01-export-osm-install-options.sh || FATAL_TRACK exportinstallopts "01-export-osm-install-options.sh failed" track exportinstallopts exportinstallopts_ok -- 2.25.1