Feature 11071: Modular OSM installation. Remove k8s monitoring options in installer

Change-Id: I1b58000b8dffb0c451ea0ddb102b225926dd0964
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 522d228..eaf3bfb 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -42,7 +42,6 @@ function usage(){
     echo -e "     --nodocker:     do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)"
     echo -e "     --nohostclient: do not install the osmclient"
     echo -e "     --uninstall:    uninstall OSM: remove the containers and delete NAT rules"
-    echo -e "     --k8s_monitor:  install the OSM kubernetes monitoring with prometheus and grafana"
     echo -e "     --showopts:     print chosen options and exit (only for debugging)"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -408,12 +407,6 @@ function install_osm() {
     echo "Deploying OSM in the K8s cluster ..."
     deploy_osm
 
-    if [ -n "$INSTALL_K8S_MONITOR" ]; then
-        # install OSM MONITORING
-        install_k8s_monitoring
-        track deploy_osm install_k8s_monitoring_ok
-    fi
-
     [ -z "$INSTALL_NOHOSTCLIENT" ] && echo "Installing osmclient ..." && install_osmclient
     track osmclient osmclient_ok
 
@@ -435,13 +428,6 @@ function install_osm() {
     return 0
 }
 
-function install_k8s_monitoring() {
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    # install OSM monitoring
-    sudo $OSM_DEVOPS/installers/k8s/install_osm_k8s_monitoring.sh -o ${OSM_NAMESPACE} || FATAL_TRACK install_k8s_monitoring "k8s/install_osm_k8s_monitoring.sh failed"
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
-}
-
 function dump_vars(){
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo "APT_PROXY_URL=$APT_PROXY_URL"
@@ -450,7 +436,6 @@ function dump_vars(){
     echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL"
     echo "DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL"
     echo "DOCKER_USER=$DOCKER_USER"
-    echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR"
     echo "INSTALL_DOCKER=$INSTALL_DOCKER"
     echo "OSM_DEVOPS=$OSM_DEVOPS"
     echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
@@ -491,7 +476,6 @@ K8S_CLUSTER_ENGINE="k3s"
 DEBUG_INSTALL=""
 RELEASE="testing-daily"
 REPOSITORY="testing"
-INSTALL_K8S_MONITOR=""
 INSTALL_DOCKER=""
 INSTALL_NOHOSTCLIENT=""
 INSTALL_AUX_CLUSTER="y"
@@ -597,7 +581,6 @@ while getopts ":a:c:e:r:n:k:u:R:D:o:O:N:s:t:U:l:L:K:d:p:T:f:F:G:M:-: hy" o; do
             [ "${OPTARG}" == "nodocker" ] && INSTALL_DOCKER="" && continue
             [ "${OPTARG}" == "showopts" ] && SHOWOPTS="y" && continue
             [ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue
-            [ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue
             echo -e "Invalid option: '--$OPTARG'\n" >&2
             usage && exit 1
             ;;

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index d46b7d4..4902357 100755 (executable)
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -46,7 +46,6 @@ function usage(){
     echo -e "     --nodocker:     do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)"
     echo -e "     --nohostclient: do not install the osmclient"
     echo -e "     --uninstall:    uninstall OSM: remove the containers and delete NAT rules"
-    echo -e "     --k8s_monitor:  install the OSM kubernetes monitoring with prometheus and grafana"
     echo -e "     --showopts:     print chosen options and exit (only for debugging)"
 }