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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 4724a14e..e053bd7d 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -308,7 +308,10 @@ function deploy_charmed_services() {
 #deploy mongodb
 function deploy_mongodb() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    deploy_charmed_services
+    MONGO_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
+    [ -n "${DOCKER_REGISTRY_URL}" ] && MONGO_OPTS="${MONGO_OPTS} -r ${DOCKER_REGISTRY_URL}"
+    $OSM_DEVOPS/installers/install_mongodb.sh ${MONGO_OPTS} || \
+    FATAL_TRACK install_osm_mongodb_service "install_mongodb.sh failed"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -532,7 +535,7 @@ function install_osm() {
 
     arrange_docker_default_network_policy
 
-    wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null
     track end
     sudo find /etc/osm
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -726,7 +729,7 @@ OSM_WORK_DIR="/etc/osm"
 OSM_HELM_WORK_DIR="${OSM_WORK_DIR}/helm"
 OSM_HOST_VOL="/var/lib/osm"
 OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}"
-OSM_DOCKER_TAG=latest
+OSM_DOCKER_TAG="testing-daily"
 DOCKER_USER=opensourcemano
 PULL_IMAGES="y"
 KAFKA_TAG=2.11-1.0.2
@@ -937,7 +940,7 @@ fi
 # Installation starts here
 
 # Get README and create OSM_TRACK_INSTALLATION_ID
-wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README.txt &> /dev/null
 export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
 
 # Get OS info to be tracked
@@ -953,7 +956,7 @@ if [ -n "$CHARMED" ]; then
     sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works"
     ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \
     FATAL_TRACK charmed_install "charmed_install.sh failed"
-    wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null
     echo -e "\nDONE"
     exit 0
 fi