Separate helm client installation from install_kubeadm_cluster
Change-Id: I3179800acf111516dfc0750d98d6fd4edf3c47a9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index fb8270f..b25cdaa 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -493,19 +493,26 @@
track prereq prereqok_ok
if [ -n "$INSTALL_DOCKER" ] || [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then
+ if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then
+ echo "Kubeadm requires docker, so docker will be installed."
+ fi
DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
[ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}"
[ -n "${OSM_BEHIND_PROXY}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -P"
$OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS} || FATAL_TRACK docker_ce "install_docker_ce.sh failed"
fi
-
track docker_ce docker_ce_ok
+ $OSM_DEVOPS/installers/install_helm_client.sh -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \
+ FATAL_TRACK k8scluster "install_helm_client.sh failed"
+ track helm_client install_helm_client_ok
+
if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then
- $OSM_DEVOPS/installers/install_kubeadm_cluster.sh -i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \
+ KUBEADM_INSTALL_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
+ $OSM_DEVOPS/installers/install_kubeadm_cluster.sh ${KUBEADM_INSTALL_OPTS} || \
FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed"
- track k8scluster k8scluster_ok
fi
+ track k8scluster k8scluster_ok
if [ -n "${INSTALL_JUJU}" ]; then
JUJU_OPTS="-D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -i ${OSM_DEFAULT_IP} ${DEBUG_INSTALL} ${INSTALL_CACHELXDIMAGES}"