X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_juju.sh;h=f00443fc6ff68986e96d533b9127b692425b30c8;hb=069e46f28033b9ecc99d7975887ecbd9b1e13ee9;hp=90632c3daea79957ebc498b8f966fe774946cc5e;hpb=4290a68170ab741ddfaf52a2ed8c8a811ee8d5c5;p=osm%2Fdevops.git diff --git a/installers/install_juju.sh b/installers/install_juju.sh index 90632c3d..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 } @@ -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