X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_juju.sh;h=f00443fc6ff68986e96d533b9127b692425b30c8;hb=bc171487ec0834146c3c1a0a3a96629aee9c6428;hp=23fd1eeffcf8ecc874855b39b4d2931bfc405fb9;hpb=5671dce4ef9fd497721fe07376d77244d783867f;p=osm%2Fdevops.git

diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 23fd1eef..f00443fc 100755
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -40,13 +40,13 @@ function update_juju_images(){
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
-function install_juju() {
+function install_juju_client() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    echo "Installing juju"
+    echo "Installing juju client"
     sudo snap install juju --classic --channel=$JUJU_VERSION/stable
     [[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}"
     [ -n "$INSTALL_CACHELXDIMAGES" ] && update_juju_images
-    echo "Finished installation of juju"
+    echo "Finished installation of juju client"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
     return 0
 }
@@ -54,7 +54,7 @@ function install_juju() {
 function juju_createcontroller_k8s(){
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     cat $HOME/.kube/config | juju add-k8s $OSM_VCA_K8S_CLOUDNAME --client \
-    || FATAL "Failed to add K8s endpoint and credential for client in cloud $OSM_VCA_K8S_CLOUDNAME"
+    || FATAL_TRACK juju "Failed to add K8s endpoint and credential for client in cloud $OSM_VCA_K8S_CLOUDNAME"
 
     JUJU_BOOTSTRAP_OPTS=""
     if [ -n "${OSM_BEHIND_PROXY}" ] ; then
@@ -77,7 +77,7 @@ EOF
             --config controller-service-type=loadbalancer \
             --agent-version=$JUJU_AGENT_VERSION \
             ${JUJU_BOOTSTRAP_OPTS} \
-    || FATAL "Failed to bootstrap controller $OSM_NAMESPACE in cloud $OSM_VCA_K8S_CLOUDNAME"
+    || FATAL_TRACK juju "Failed to bootstrap controller $OSM_NAMESPACE in cloud $OSM_VCA_K8S_CLOUDNAME"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -156,7 +156,7 @@ function juju_createproxy() {
 DEBUG_INSTALL=""
 INSTALL_CACHELXDIMAGES=""
 INSTALL_NOJUJU=""
-JUJU_AGENT_VERSION=2.9.34
+JUJU_AGENT_VERSION=2.9.43
 JUJU_VERSION=2.9
 OSM_BEHIND_PROXY=""
 OSM_DEVOPS=
@@ -226,7 +226,7 @@ echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY"
 echo "OSM_DEVOPS=$OSM_DEVOPS"
 echo "HOME=$HOME"
 
-[ -z "$INSTALL_NOJUJU" ] && install_juju
+[ -z "$INSTALL_NOJUJU" ] && install_juju_client
 track juju juju_client_ok
 
 if [ -z "$OSM_VCA_HOST" ]; then
@@ -234,7 +234,7 @@ if [ -z "$OSM_VCA_HOST" ]; then
         juju_createcontroller_k8s
         juju_addlxd_cloud
         if [ -n "$LXD_CLOUD_FILE" ]; then
-            [ -z "$LXD_CRED_FILE" ] && FATAL "The installer needs the LXD credential yaml if the LXD is external"
+            [ -z "$LXD_CRED_FILE" ] && FATAL_TRACK juju "The installer needs the LXD credential yaml if the LXD is external"
             OSM_VCA_CLOUDNAME="lxd-cloud"
             juju add-cloud $OSM_VCA_CLOUDNAME $LXD_CLOUD_FILE --force || juju update-cloud $OSM_VCA_CLOUDNAME --client -f $LXD_CLOUD_FILE
             juju add-credential $OSM_VCA_CLOUDNAME -f $LXD_CRED_FILE || juju update-credential $OSM_VCA_CLOUDNAME lxd-cloud-creds -f $LXD_CRED_FILE
@@ -243,7 +243,7 @@ if [ -z "$OSM_VCA_HOST" ]; then
     else
         OSM_VCA_CLOUDNAME="lxd-cloud"
         if [ -n "$LXD_CLOUD_FILE" ]; then
-            [ -z "$LXD_CRED_FILE" ] && FATAL "The installer needs the LXD credential yaml if the LXD is external"
+            [ -z "$LXD_CRED_FILE" ] && FATAL_TRACK juju "The installer needs the LXD credential yaml if the LXD is external"
             juju add-cloud -c $CONTROLLER_NAME $OSM_VCA_CLOUDNAME $LXD_CLOUD_FILE --force || juju update-cloud lxd-cloud -c $CONTROLLER_NAME -f $LXD_CLOUD_FILE
             juju add-credential -c $CONTROLLER_NAME $OSM_VCA_CLOUDNAME -f $LXD_CRED_FILE || juju update-credential lxd-cloud -c $CONTROLLER_NAME -f $LXD_CRED_FILE
         else
@@ -280,8 +280,6 @@ EOF
     fi
     [ -z "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`sg lxd -c "juju show-controller $OSM_NAMESPACE"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
     [ -n "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`juju show-controller $CONTROLLER_NAME |grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
-    [ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address"
+    [ -z "$OSM_VCA_HOST" ] && FATAL_TRACK juju "Cannot obtain juju controller IP address"
 fi
 track juju juju_controller_ok
-
-