X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=3084207a1dee6525dc2f00a6bb6b7cd466af0391;hb=0ab1661aeeb0ccfe708e9d79917bd18fdadad13c;hp=d811382907144756a025a68df8126cda67b25be0;hpb=adcf95ed24eb565e97c003f5041acdf766c72471;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index d8113829..3084207a 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -143,10 +143,12 @@ function check_packages() {
     NEEDED_PACKAGES="$1"
     echo -e "Checking required packages: ${NEEDED_PACKAGES}"
     for PACKAGE in ${NEEDED_PACKAGES} ; do
-        dpkg -L ${PACKAGE} &>/dev/null
+        dpkg -L ${PACKAGE}
         if [ $? -ne 0 ]; then
-            echo -e "Package ${PACKAGE} is not installed. Updating apt"
+            echo -e "Package ${PACKAGE} is not installed."
+            echo -e "Updating apt-cache ..."
             sudo apt-get update
+            echo -e "Installing ${PACKAGE} ..."
             sudo apt-get install -y ${PACKAGE} || FATAL "failed to install ${PACKAGE}"
         fi
     done
@@ -253,10 +255,6 @@ function generate_docker_images() {
         sg docker -c "docker pull wurstmeister/kafka:${KAFKA_TAG}" || FATAL "cannot get kafka docker image"
     fi
 
-    if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MONGO ; then
-        sg docker -c "docker pull mongo" || FATAL "cannot get mongo docker image"
-    fi
-
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q PROMETHEUS ; then
         sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image"
     fi
@@ -267,6 +265,7 @@ function generate_docker_images() {
 
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q GRAFANA ; then
         sg docker -c "docker pull grafana/grafana:${GRAFANA_TAG}" || FATAL "cannot get grafana docker image"
+        sg docker -c "docker pull kiwigrid/k8s-sidecar:${KIWIGRID_K8S_SIDECAR_TAG}" || FATAL "cannot get kiwigrid k8s-sidecar docker image"
     fi
 
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then
@@ -340,7 +339,6 @@ function generate_k8s_manifest_files() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     #Kubernetes resources
     sudo cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
-    sudo rm -f $OSM_K8S_WORK_DIR/mongo.yaml
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -659,7 +657,6 @@ function install_osm() {
 
     # if no host is passed in, we need to install lxd/juju, unless explicilty asked not to
     if [ -z "$OSM_VCA_HOST" ] && [ -z "$INSTALL_NOLXD" ] && [ -z "$LXD_CLOUD_FILE" ]; then
-        check_packages "snapd"
         install_lxd
     fi
 
@@ -838,6 +835,8 @@ function dump_vars(){
     echo "OPENSTACK_VM_NAME"="$OPENSTACK_VM_NAME"
     echo "OSM_DEVOPS=$OSM_DEVOPS"
     echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
+    echo "OSM_DOCKER_WORK_DIR=$OSM_DOCKER_WORK_DIR"
+    echo "OSM_K8S_WORK_DIR=$OSM_K8S_WORK_DIR"
     echo "OSM_STACK_NAME=$OSM_STACK_NAME"
     echo "OSM_VCA_HOST=$OSM_VCA_HOST"
     echo "OSM_VCA_PUBKEY=$OSM_VCA_PUBKEY"
@@ -875,7 +874,7 @@ function ctrl_c() {
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.17
+JUJU_AGENT_VERSION=2.9.22
 UNINSTALL=""
 DEVELOP=""
 UPDATE=""
@@ -931,8 +930,9 @@ OSM_DOCKER_TAG=latest
 DOCKER_USER=opensourcemano
 PULL_IMAGES="y"
 KAFKA_TAG=2.11-1.0.2
-PROMETHEUS_TAG=v2.4.3
-GRAFANA_TAG=latest
+KIWIGRID_K8S_SIDECAR_TAG="1.15.6"
+PROMETHEUS_TAG=v2.28.1
+GRAFANA_TAG=8.1.1
 PROMETHEUS_NODE_EXPORTER_TAG=0.18.1
 PROMETHEUS_CADVISOR_TAG=latest
 KEYSTONEDB_TAG=10
@@ -1154,7 +1154,7 @@ fi
 # if develop, we force master
 [ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master"
 
-check_packages "git wget curl tar"
+check_packages "git wget curl tar snapd"
 
 sudo snap install jq
 if [ -z "$OSM_DEVOPS" ]; then