Add validation to Network Slice descriptor in validate_descriptor.py

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 146cda0..a345b79 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -157,7 +157,6 @@ function uninstall_lightweight() {
         if [ -n "$INSTALL_PERFMON" ]; then
             echo -e "\nUninstalling OSM Performance Monitoring stack"
             remove_stack osm_metrics
-            sg docker -c "docker image rm osm/kafka-exporter"
             $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR/osm_metrics
         fi
     else
@@ -167,14 +166,14 @@ function uninstall_lightweight() {
         remove_stack osm_metrics
         echo "Now osm docker images and volumes will be deleted"
         newgrp docker << EONG
-        docker image rm ${DOCKER_USER}/ro
-        docker image rm ${DOCKER_USER}/lcm
-        docker image rm ${DOCKER_USER}/light-ui
-        docker image rm ${DOCKER_USER}/keystone
-        docker image rm ${DOCKER_USER}/nbi
-        docker image rm ${DOCKER_USER}/mon
-        docker image rm ${DOCKER_USER}/pm
-        docker image rm ${DOCKER_USER}/kafka-exporter
+        docker image rm ${DOCKER_USER}/ro:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/lcm:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/keystone:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/nbi:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/mon:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/pol:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/osmclient:${OSM_DOCKER_TAG}
 EONG
         remove_volumes $OSM_STACK_NAME
         remove_network $OSM_STACK_NAME
@@ -898,6 +897,7 @@ function deploy_elk() {
     sg docker -c "docker pull docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}" || FATAL "cannot get metricbeat docker image"
     sg docker -c "docker pull docker.elastic.co/beats/filebeat:${ELASTIC_VERSION}" || FATAL "cannot get filebeat docker image"
     sg docker -c "docker pull docker.elastic.co/kibana/kibana-oss:${ELASTIC_VERSION}" || FATAL "cannot get kibana docker image"
+    sg docker -c "docker pull bobrik/curator:${ELASTIC_CURATOR_VERSION}" || FATAL "cannot get curator docker image"
     echo "Finished pulling elk docker images"
     $WORKDIR_SUDO mkdir -p "$OSM_DOCKER_WORK_DIR/osm_elk"
     $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/osm_elk/* $OSM_DOCKER_WORK_DIR/osm_elk
@@ -1162,6 +1162,7 @@ PROMETHEUS_TAG=v2.4.3
 KEYSTONEDB_TAG=10
 OSM_DATABASE_COMMONKEY=
 ELASTIC_VERSION=6.4.2
+ELASTIC_CURATOR_VERSION=5.5.4
 
 while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:U:" o; do
     case "${o}" in