projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
full_install_osm.sh: fix k8s installation, node must be tainted before juju_addk8s...
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
1d06566
..
66cfe49
100755
(executable)
--- 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
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
track init_k8s
else
#install_docker_compose
@@
-1166,13
+1165,6
@@
EOF
track docker_swarm
fi
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
[ -z "$DOCKER_NOBUILD" ] && generate_docker_images
track docker_build
@@
-1196,6
+1188,12
@@
EOF
deploy_osm_pla_service
fi
track deploy_osm_services_k8s
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
if [ -n "$INSTALL_K8S_MONITOR" ]; then
# install OSM MONITORING
install_k8s_monitoring