Add user-values to OSM installation in 40-deploy-osm.sh

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

diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh
index f6d89e2..12206b2 100755 (executable)
--- a/installers/40-deploy-osm.sh
+++ b/installers/40-deploy-osm.sh
@@ -122,9 +122,11 @@ if [ -n "${OSM_BEHIND_PROXY}" ]; then
     fi
 fi
 
-echo "helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_HELM_RELEASE ${HERE}/helm/osm --values ${HERE}/helm/osm/values.yaml ${OSM_HELM_OPTS}"
-helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_HELM_RELEASE ${HERE}/helm/osm --values ${HERE}/helm/osm/values.yaml ${OSM_HELM_OPTS}
-# Override existing values.yaml with the final values.yaml used to install OSM
+[ ! -f "${OSM_HOME_DIR}/user-values.yaml" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --values ${OSM_HOME_DIR}/user-values.yaml"
+
+echo "helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_HELM_RELEASE ${HERE}/helm/osm ${OSM_HELM_OPTS}"
+helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_HELM_RELEASE ${HERE}/helm/osm ${OSM_HELM_OPTS}
+# Export final values.yaml used to install OSM to a file for future reference
 helm -n $OSM_NAMESPACE get values $OSM_HELM_RELEASE | sudo tee -a ${OSM_HELM_WORK_DIR}/osm-values.yaml
 
 # Check OSM health state