Add timeout option to OSM helm chart deployment

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

diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc
index eac6569..1961d4f 100644 (file)
--- a/installers/00-default-install-options.rc
+++ b/installers/00-default-install-options.rc
@@ -47,4 +47,4 @@ export OSM_BEHIND_PROXY=
 export OPENSHIFT_MGMT_CLUSTER=
 export MGMT_CLUSTER_CA_FILE=
 export OSM_K8S_NGINX_IPADDRESS=
-
+export OSM_HELM_TIMEOUT=

diff --git a/installers/01-export-osm-install-options.sh b/installers/01-export-osm-install-options.sh
index 2aca744..414a55f 100755 (executable)
--- a/installers/01-export-osm-install-options.sh
+++ b/installers/01-export-osm-install-options.sh
@@ -63,6 +63,7 @@ export OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY}
 export OPENSHIFT_MGMT_CLUSTER=${OPENSHIFT_MGMT_CLUSTER}
 export MGMT_CLUSTER_CA_FILE=${MGMT_CLUSTER_CA_FILE}
 export OSM_K8S_NGINX_IPADDRESS=${OSM_K8S_NGINX_IPADDRESS}
+export OSM_HELM_TIMEOUT=${OSM_HELM_TIMEOUT}
 EOF
 
 cat "${OSM_HOME_DIR}/user-install-options.rc"

diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh
index aa7f4a2..6b138e0 100755 (executable)
--- a/installers/40-deploy-osm.sh
+++ b/installers/40-deploy-osm.sh
@@ -72,6 +72,7 @@ fi
 # Generate helm values to be passed with --set
 OSM_HELM_OPTS=""
 # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false"
+[ -n "${OSM_HELM_TIMEOUT}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --timeout ${OSM_HELM_TIMEOUT}"
 
 # TODO: review if next line is really needed or should be conditional to DOCKER_REGISTRY_URL not empty
 # [ -n "${DOCKER_REGISTRY_URL}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repository=${DOCKER_REGISTRY_URL}${DOCKER_USER}"