From ee0e42bd01045016a7d782a4e19069a905cd8d68 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 7 Jun 2023 12:21:33 +0200 Subject: [PATCH 1/1] Simplify pulling of images in installer, and pull OSM prometheus image before deploying Change-Id: I6071b0b584c39677401dcb580c718809b345930d Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 37 +++++++++------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 03439a1c..8d862f60 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -222,33 +222,16 @@ function pull_docker_images() { [ -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 -- 2.25.1