commit ac5bd33c65d4a8a108efd788022d1ef2a994945b
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Jul 08 14:13:40 2020 +0000
committer beierlm <mark.beierl@canonical.com> Wed Jul 08 16:45:55 2020 +0200
tree 7d89112310704903830d48df0b112560b8244825
parent 944d34678f25b7fde7164688b125584acabd748e

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>

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1d06566..66cfe49 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1158,7 +1158,6 @@
         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 @@
         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 @@
             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