From: beierlm <mark.beierl@canonical.com>
Date: Wed, 27 May 2020 14:32:32 +0000 (+0200)
Subject: Merge "Added Grafana Chart to K8s based OSM. Base for being merged with k8s_monitor"
X-Git-Tag: release-v8.0-start~30
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=0fead9c123d7caf6d46aadbc4eb10ee2d618affd

Merge "Added Grafana Chart to K8s based OSM. Base for being merged with k8s_monitor"
---

0fead9c123d7caf6d46aadbc4eb10ee2d618affd
diff --cc installers/full_install_osm.sh
index 69c3a631,cecb7463..ebccb925
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -786,11 -772,44 +797,44 @@@ function deploy_osm_pla_service() 
      kubectl apply -n $OSM_STACK_NAME -f $OSM_DOCKER_WORK_DIR/osm_pla
  }
  
+ #Install helm and tiller
+ function install_helm() {
+     helm > /dev/null 2>&1
+     if [ $? != 0 ] ; then
+         # Helm is not installed. Install helm
+         curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15.2.tar.gz
+         tar -zxvf helm-v2.15.2.tar.gz
+         sudo mv linux-amd64/helm /usr/local/bin/helm
+         rm -r linux-amd64
+         rm helm-v2.15.2.tar.gz
+     fi
+ 
+     # Checking if tiller has being configured
+     kubectl --namespace kube-system get serviceaccount tiller > /dev/null 2>&1
+     if [ $? == 1 ] ; then
+         # tiller account for kubernetes
+         kubectl --namespace kube-system create serviceaccount tiller
+         kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
+         # HELM initialization
+         helm init --service-account tiller
+ 
+         # Wait for Tiller to be up and running. If timeout expires, continue installing
+         tiller_timeout=120; counter=0
+         while (( counter < tiller_timeout ))
+         do
+             tiller_status=`kubectl -n kube-system get deployment.apps/tiller-deploy --no-headers |  awk '{print $2'}`
+             ( [ ! -z "$tiller_status" ] && [ $tiller_status == "1/1" ] ) && break
+             num=$((counter + 2))
+             sleep 2
+         done
+     fi
+ }
+ 
  function parse_yaml() {
 -    osm_services="nbi lcm ro pol mon light-ui keystone"
 +    osm_services="nbi lcm ro pol mon light-ui ng-ui keystone"
      TAG=$1
      for osm in $osm_services; do
 -        $WORKDIR_SUDO sed -i "s/opensourcemano\/$osm:.*/opensourcemano\/$osm:$TAG/g" $OSM_K8S_WORK_DIR/$osm.yaml
 +        $WORKDIR_SUDO sed -i "s/opensourcemano\/$osm:.*/$DOCKER_USER\/$osm:$TAG/g" $OSM_K8S_WORK_DIR/$osm.yaml
      done
  }