full_install_osm.sh: separate taint of master node and deployment of osm

Change-Id: I6b5b314949d9775b6e71312d97dc293a49385945
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
(cherry picked from commit f7d00303fa336fc223280cceca30a1b3679f6795)

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 0688068..fcb7ec1 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -798,11 +798,15 @@ function kube_secrets(){
     kubectl create secret generic pol-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/pol.env
 }
 
     kubectl create secret generic pol-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/pol.env
 }
 

-#deploys osm pods and services
-function deploy_osm_services() {
+#taints K8s master node
+function taint_master_node() {

     K8S_MASTER=$(kubectl get nodes | awk '$3~/master/'| awk '{print $1}')
     kubectl taint node $K8S_MASTER node-role.kubernetes.io/master:NoSchedule-
     sleep 5
     K8S_MASTER=$(kubectl get nodes | awk '$3~/master/'| awk '{print $1}')
     kubectl taint node $K8S_MASTER node-role.kubernetes.io/master:NoSchedule-
     sleep 5

+}
+
+#deploys osm pods and services
+function deploy_osm_services() {

     kubectl apply -n $OSM_STACK_NAME -f $OSM_K8S_WORK_DIR
 }
 
     kubectl apply -n $OSM_STACK_NAME -f $OSM_K8S_WORK_DIR
 }
 


@@ -1173,6 +1177,7 @@ EOF
         kube_secrets
         [ ! $OSM_DOCKER_TAG == "7" ] && parse_yaml $OSM_DOCKER_TAG
         namespace_vol
         kube_secrets
         [ ! $OSM_DOCKER_TAG == "7" ] && parse_yaml $OSM_DOCKER_TAG
         namespace_vol

+        taint_master_node

         deploy_osm_services
         if [ -n "$INSTALL_PLA"]; then
             # optional PLA install
         deploy_osm_services
         if [ -n "$INSTALL_PLA"]; then
             # optional PLA install