X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=b411dbbfdd936c7878b658c25362f7ec016e62db;hb=1a423a467dca38dab970ea9e0f7480be1f2dfc83;hp=3895ce8db8d49a0cc945cd15b5afb12a49c65f39;hpb=3749e31006f1e6a84533d6a2b616b22f0220d822;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 3895ce8d..b411dbbf 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -27,7 +27,7 @@ function check_arguments(){ --lxd) LXD_CLOUD="$2" ;; --lxd-cred) LXD_CREDENTIALS="$2" ;; --microstack) MICROSTACK=y ;; - --ha) BUNDLE="osm-ha" ;; + --ha) BUNDLE="cs:osm-ha" ;; --tag) TAG="$2" ;; esac shift @@ -78,7 +78,6 @@ function bootstrap_k8s_lxd(){ # Install LXD snap sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client sudo snap install lxd - sudo apt-get install zfsutils-linux -y # Configure LXD sudo usermod -a -G lxd `whoami` cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed" @@ -137,7 +136,7 @@ function deploy_charmed_osm(){ else images_overlay="" [ -v TAG ] && generate_images_overlay && images_overlay="--overlay $IMAGES_OVERLAY_FILE" - juju deploy osm --overlay ~/.osm/vca-overlay.yaml $images_overlay + juju deploy cs:osm --overlay ~/.osm/vca-overlay.yaml $images_overlay fi echo "Waiting for deployment to finish..." check_osm_deployed &> /dev/null