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 <gerardo.garciadeblas@telefonica.com>

diff --git a/installers/01-export-osm-install-options.sh b/installers/01-export-osm-install-options.sh
index 4f2ed18..963c924 100755 (executable)
--- 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 c1169cc..35a9d9e 100755 (executable)
--- 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