X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=8d862f60a91226b3e79b26516b34bf3b59bcd7ff;hb=ee0e42bd01045016a7d782a4e19069a905cd8d68;hp=943a0804b8b6a11efaedaaa6e4eb110bc845af42;hpb=bc5422cf9fd9d21d7028d445fe1982080101611a;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 943a0804..8d862f60 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -216,51 +216,22 @@ function docker_login() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
-function create_k8s_secret_regcred() {
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    echo "Creating K8s secret regcred with the docker registry credentials from $HOME/.docker/config.json"
-    kubectl -n osm create secret generic regcred \
-        --from-file=.dockerconfigjson=$HOME/.docker/config.json \
-        --type=kubernetes.io/dockerconfigjson
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
-}
-
 function pull_docker_images() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo "Pulling docker images"
-    if [ -n "${DOCKER_REGISTRY_URL}" ]; then
-        docker_login
-        create_k8s_secret_registrycreds
-    fi
+    [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login
 
     echo "Pulling non-OSM docker images"
-    if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q KAFKA ; then
-        sg docker -c "docker pull wurstmeister/zookeeper" || FATAL "cannot get zookeeper docker image"
-        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 PROMETHEUS ; then
-        sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image"
-    fi
-
-    if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q PROMETHEUS-CADVISOR ; then
-        sg docker -c "docker pull google/cadvisor:${PROMETHEUS_CADVISOR_TAG}" || FATAL "cannot get prometheus cadvisor docker image"
-    fi
-
-    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
-        sg docker -c "docker pull mariadb:${KEYSTONEDB_TAG}" || FATAL "cannot get keystone-db docker image"
-    fi
-
-    if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q RO ; then
-        sg docker -c "docker pull mysql:5" || FATAL "cannot get mysql docker image"
-    fi
-
-    list_of_modules="MON NBI KEYSTONE RO LCM NG-UI osmclient"
+    sg docker -c "docker pull wurstmeister/zookeeper" || FATAL "cannot get zookeeper docker image"
+    sg docker -c "docker pull wurstmeister/kafka:${KAFKA_TAG}" || FATAL "cannot get kafka docker image"
+    sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image"
+    sg docker -c "docker pull google/cadvisor:${PROMETHEUS_CADVISOR_TAG}" || FATAL "cannot get prometheus cadvisor docker image"
+    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"
+    sg docker -c "docker pull mariadb:${KEYSTONEDB_TAG}" || FATAL "cannot get keystone-db docker image"
+    sg docker -c "docker pull mysql:5" || FATAL "cannot get mysql docker image"
+
+    list_of_modules="MON NBI KEYSTONE RO LCM NG-UI osmclient prometheus"
     if [ -n "$INSTALL_NGSA" ]; then
         list_of_modules="${list_of_modules} Airflow Webhook"
     else
@@ -495,7 +466,6 @@ function install_osm() {
     [ -n "$DOCKER_REGISTRY_URL" ] && parse_docker_registry_url
 
     check_osm_behind_proxy
-    track checks proxy_ok
 
     check_packages "git wget curl tar snapd"
 
@@ -566,7 +536,7 @@ function install_osm() {
     track docker_images docker_images_ok
 
     deploy_charmed_services
-    track deploy_osm deploy_charmed_services_ok
+    track deploy_osm deploy_mongodb_ok
     deploy_osm_services
     track deploy_osm deploy_osm_services_k8s_ok
     if [ -n "$INSTALL_K8S_MONITOR" ]; then