Bug 2415: Add values.yaml to helm upgrade command for OSM installation

Change-Id: I3b7609fe1b526e5683504794805e2524c875e3b4
Signed-off-by: Marios <mariosfish1+osm@gmail.com>

diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh
index ca83d54..f6d89e2 100755 (executable)
--- a/installers/40-deploy-osm.sh
+++ b/installers/40-deploy-osm.sh
@@ -122,8 +122,8 @@ if [ -n "${OSM_BEHIND_PROXY}" ]; then
     fi
 fi
 
-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}
+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
 helm -n $OSM_NAMESPACE get values $OSM_HELM_RELEASE | sudo tee -a ${OSM_HELM_WORK_DIR}/osm-values.yaml