X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_juju.sh;h=7be5f99cbaa4a231bbe9fbaf8564cb8392b81503;hb=8375da1695c98bd23fcc226f0e26c20ac5710d1b;hp=aff8c7d68c5388ba9d2cccf4ba987ac5d75bf955;hpb=ccb2237f8034980f64487e10941fec4ff1f36547;p=osm%2Fdevops.git diff --git a/installers/install_juju.sh b/installers/install_juju.sh index aff8c7d6..7be5f99c 100755 --- a/installers/install_juju.sh +++ b/installers/install_juju.sh @@ -29,7 +29,6 @@ function usage(){ echo -e " -K: Specifies the name of the controller to use - The controller must be already bootstrapped" echo -e " --debug: debug mode" echo -e " --cachelxdimages: cache local lxd images, create cronjob for that cache (will make installation longer)" - echo -e " --nojuju: do not juju, assumes already installed" [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } @@ -156,7 +155,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= @@ -195,7 +194,6 @@ while getopts ":D:i:s:H:l:L:K:-: hP" o; do -) [ "${OPTARG}" == "help" ] && usage && exit 0 [ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="--debug" && continue - [ "${OPTARG}" == "nojuju" ] && INSTALL_NOJUJU="y" && continue [ "${OPTARG}" == "cachelxdimages" ] && INSTALL_CACHELXDIMAGES="y" && continue echo -e "Invalid option: '--$OPTARG'\n" >&2 usage && exit 1