X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=4724a14ea5950d421554c8076282beba660beeac;hb=24a95101aba95edef170e7f1c4a9444a48de61d5;hp=8dbc1514aa6e530910cf7b29d6e5014209c89abb;hpb=81077aeb651fd5cd24ba193d362be14895c27aa6;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8dbc1514..4724a14e 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -215,45 +215,6 @@ function docker_login() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
-function pull_docker_images() {
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    echo "Pulling docker images"
-    [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login
-
-    echo "Pulling non-OSM docker images"
-    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
-        list_of_modules="${list_of_modules} POL"
-    fi
-    if [ -n "$INSTALL_PLA" ]; then
-        list_of_modules="${list_of_modules} PLA"
-    fi
-    echo "Pulling OSM docker images for the following modules: ${list_of_modules}"
-    for module in ${list_of_modules}; do
-        module_lower=${module,,}
-        module_tag="${OSM_DOCKER_TAG}"
-        if [ -n "${MODULE_DOCKER_TAG}" ] && echo $TO_REBUILD | grep -q $module ; then
-            module_tag="${MODULE_DOCKER_TAG}"
-        fi
-        echo "Pulling ${DOCKER_REGISTRY_URL}${DOCKER_USER}/${module_lower}:${module_tag} docker image"
-        sg docker -c "docker pull ${DOCKER_REGISTRY_URL}${DOCKER_USER}/${module_lower}:${module_tag}" || FATAL "cannot pull $module docker image"
-    done
-
-    echo "Finished pulling docker images"
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
-}
-
 function generate_docker_images() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo "Generating docker images"
@@ -319,7 +280,7 @@ EOF"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.secret=${OSM_VCA_SECRET}"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}"
     [ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}"
-    [ ! "$OSM_DOCKER_TAG" == "13" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}"
+    [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}"
     [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
     if [ -n "${OSM_BEHIND_PROXY}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
@@ -344,6 +305,13 @@ function deploy_charmed_services() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
+#deploy mongodb
+function deploy_mongodb() {
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
+    deploy_charmed_services
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
+}
+
 function install_osm_ngsa_service() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     NGSA_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
@@ -531,11 +499,10 @@ function install_osm() {
     track juju juju_ok
 
     # Deploy OSM services
-    [ -z "$DOCKER_NOBUILD" ] && pull_docker_images
     [ -z "$DOCKER_NOBUILD" ] && [ -z "$PULL_IMAGES" ] && generate_docker_images
     track docker_images docker_images_ok
 
-    deploy_charmed_services
+    deploy_mongodb
     track deploy_osm deploy_mongodb_ok
     deploy_osm_services
     track deploy_osm deploy_osm_services_k8s_ok