X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=2ec03339764cffdffea94e54dc74206c6da0ea2b;hb=ca342385ad50e4374e1af6f39134b337efa661a3;hp=678d969422d2b199a100c925c5e9df2f96125adb;hpb=4790cbab4da4ce9b32913e8e867e7466b3d8d778;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 678d9694..2ec03339 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -16,7 +16,7 @@
 function usage(){
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo -e "usage: $0 [OPTIONS]"
-    echo -e "Install OSM from binaries or source code (by default, from binaries)"
+    echo -e "Install OSM"
     echo -e "  OPTIONS"
     echo -e "     -h / --help:    print this help"
     echo -e "     -y:             do not prompt for confirmation, assumes yes"
@@ -183,13 +183,12 @@ function install_osmclient(){
     sudo apt-get -y update
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip
     sudo -H LC_ALL=C python3 -m pip install -U pip
-    sudo -H LC_ALL=C python3 -m pip install -U python-magic pyangbind verboselogs
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-im python3-osmclient
     if [ -f /usr/lib/python3/dist-packages/osm_im/requirements.txt ]; then
         python3 -m pip install -r /usr/lib/python3/dist-packages/osm_im/requirements.txt
     fi
     if [ -f /usr/lib/python3/dist-packages/osmclient/requirements.txt ]; then
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libmagic1
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1
         python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt
     fi
     [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=`lxc list | awk '($2=="SO-ub"){print $6}'`
@@ -320,7 +319,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"
@@ -345,6 +344,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}"
@@ -536,7 +542,7 @@ function install_osm() {
     [ -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