X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;fp=installers%2Ffull_install_osm.sh;h=a5fc9f4e7d49ebc9c3f0495ad9aa6d225a6e07b0;hb=8cc3a283b46f20b256b2044e505ac03a32fb2113;hp=e1f2ff2bccf3f896f6c2bea2f4d2b2e38963fbf2;hpb=5c1fc56c9ff8a8dc99bc8cd88d8f0268a097a38c;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index e1f2ff2b..a5fc9f4e 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -83,7 +83,7 @@ function uninstall(){ } # takes a juju/accounts.yaml file and returns the password specific -# for a controller. I wrote this using only bash tools to minimize +# for a controller. I wrote this using only bash tools to minimize # additions of other packages function parse_juju_password { password_file="${HOME}/.local/share/juju/accounts.yaml" @@ -632,11 +632,11 @@ function install_juju() { } function juju_createcontroller() { - if ! sg lxd -c "juju show-controller $OSM_STACK_NAME &> /dev/null"; then + if ! juju show-controller $OSM_STACK_NAME &> /dev/null; then # Not found created, create the controller sg lxd -c "juju bootstrap --bootstrap-series=xenial localhost $OSM_STACK_NAME" fi - [ $(sg lxd -c "juju controllers" | awk "/^${OSM_STACK_NAME}[\*| ]/{print $1}"|wc -l) -eq 1 ] || FATAL "Juju installation failed" + [ $(juju controllers | awk "/^${OSM_STACK_NAME}[\*| ]/{print $1}"|wc -l) -eq 1 ] || FATAL "Juju installation failed" } function generate_docker_images() { @@ -1399,4 +1399,3 @@ fi wget -q -O- https://osm-download.etsi.org/ftp/osm-4.0-four/README2.txt &> /dev/null track end echo -e "\nDONE" -