From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 8 Jul 2020 14:13:40 +0000 (+0000)
Subject: full_install_osm.sh: fix k8s installation, node must be tainted before juju_addk8s... 
X-Git-Tag: v8.0.0rc3~20
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=ac5bd33c65d4a8a108efd788022d1ef2a994945b

full_install_osm.sh: fix k8s installation, node must be tainted before juju_addk8s and install_helm

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1d06566c..66cfe495 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1158,7 +1158,6 @@ EOF
         track install_k8s
         init_kubeadm $OSM_DOCKER_WORK_DIR/cluster-config.yaml
         kube_config_dir
-        install_k8s_storageclass
         track init_k8s
     else
         #install_docker_compose
@@ -1166,13 +1165,6 @@ EOF
         track docker_swarm
     fi
 
-    if [ -n "$KUBERNETES" ]; then
-        juju_addk8s
-        track juju_addk8s
-        install_helm
-        track install_helm
-    fi
-
     [ -z "$DOCKER_NOBUILD" ] && generate_docker_images
     track docker_build
 
@@ -1196,6 +1188,12 @@ EOF
             deploy_osm_pla_service
         fi
         track deploy_osm_services_k8s
+        install_k8s_storageclass
+        track k8s_storageclass
+        juju_addk8s
+        track juju_addk8s
+        install_helm
+        track install_helm
         if [ -n "$INSTALL_K8S_MONITOR" ]; then
             # install OSM MONITORING
             install_k8s_monitoring