Skip to content
Snippets Groups Projects
Commit ccb2237f authored by garciadeblas's avatar garciadeblas
Browse files

Rename install_juju to install_juju_client in install_juju.sh


Change-Id: Iba9baef126eab52cfc06506ee6576a73c99cfa2e
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 24fb69d2
No related branches found
No related tags found
No related merge requests found
...@@ -40,13 +40,13 @@ function update_juju_images(){ ...@@ -40,13 +40,13 @@ function update_juju_images(){
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
function install_juju() { function install_juju_client() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
echo "Installing juju" echo "Installing juju client"
sudo snap install juju --classic --channel=$JUJU_VERSION/stable sudo snap install juju --classic --channel=$JUJU_VERSION/stable
[[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}" [[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}"
[ -n "$INSTALL_CACHELXDIMAGES" ] && update_juju_images [ -n "$INSTALL_CACHELXDIMAGES" ] && update_juju_images
echo "Finished installation of juju" echo "Finished installation of juju client"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
return 0 return 0
} }
...@@ -226,7 +226,7 @@ echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY" ...@@ -226,7 +226,7 @@ echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY"
echo "OSM_DEVOPS=$OSM_DEVOPS" echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "HOME=$HOME" echo "HOME=$HOME"
[ -z "$INSTALL_NOJUJU" ] && install_juju [ -z "$INSTALL_NOJUJU" ] && install_juju_client
track juju juju_client_ok track juju juju_client_ok
if [ -z "$OSM_VCA_HOST" ]; then if [ -z "$OSM_VCA_HOST" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment