commit 5671dce4ef9fd497721fe07376d77244d783867f
author garciadeblas <gerardo.garciadeblas@telefonica.com> Thu May 18 11:28:16 2023 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Wed May 31 11:52:21 2023 +0200
tree a6b306b397a37d7c4d3d8050f511d0cd075c03dc
parent e4022249741336c5c78e8fa155a13d1f71f06a04

Fix installation tracking issues

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

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index b1e868a..23d8f07 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -519,7 +519,7 @@
     # 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"

installers/install_juju.sh

diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 68c8628..23fd1ee 100755
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -227,7 +227,7 @@
 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

installers/install_lxd.sh

diff --git a/installers/install_lxd.sh b/installers/install_lxd.sh
index ca77c90..7395c73 100755
--- a/installers/install_lxd.sh
+++ b/installers/install_lxd.sh
@@ -132,5 +132,5 @@
 echo "OSM_DEVOPS=$OSM_DEVOPS"
 
 [ -z "$INSTALL_NOJUJU" ] && install_lxd
-track juju juju_install_ok
+track prereq lxd_install_ok