From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 18 May 2023 09:28:16 +0000 (+0200)
Subject: Fix installation tracking issues
X-Git-Tag: release-v14.0-start~39
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=5671dce4ef9fd497721fe07376d77244d783867f

Fix installation tracking issues

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index b1e868ad..23d8f078 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -519,7 +519,7 @@ function install_osm() {
     # configure apt proxy
     [ -n "$APT_PROXY_URL" ] && configure_apt_proxy $APT_PROXY_URL
 
-    # if no host is passed in, we need to install lxd/juju, unless explicilty asked not to
+    # if no host is passed in, we need to install lxd, unless explicilty asked not to
     if [ -z "$OSM_VCA_HOST" ] && [ -z "$INSTALL_NOLXD" ] && [ -z "$LXD_CLOUD_FILE" ]; then
         LXD_INSTALL_OPTS="-D ${OSM_DEVOPS} -i ${OSM_DEFAULT_IF} ${DEBUG_INSTALL}"
         [ -n "${OSM_BEHIND_PROXY}" ] && LXD_INSTALL_OPTS="${LXD_INSTALL_OPTS} -P"
diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 68c86280..23fd1eef 100755
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -227,7 +227,7 @@ echo "OSM_DEVOPS=$OSM_DEVOPS"
 echo "HOME=$HOME"
 
 [ -z "$INSTALL_NOJUJU" ] && install_juju
-track juju juju_install_ok
+track juju juju_client_ok
 
 if [ -z "$OSM_VCA_HOST" ]; then
     if [ -z "$CONTROLLER_NAME" ]; then
diff --git a/installers/install_lxd.sh b/installers/install_lxd.sh
index ca77c90d..7395c731 100755
--- a/installers/install_lxd.sh
+++ b/installers/install_lxd.sh
@@ -132,5 +132,5 @@ echo "OSM_DEFAULT_IF=$OSM_DEFAULT_IF"
 echo "OSM_DEVOPS=$OSM_DEVOPS"
 
 [ -z "$INSTALL_NOJUJU" ] && install_lxd
-track juju juju_install_ok
+track prereq lxd_install_ok