Hackfest3 charmed scenario added

[osm/devops.git] / installers / install_osm.sh

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 9ba080a..bacf424 100755 (executable)
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -533,7 +533,7 @@ function install_juju() {
     echo "Installing juju"
     sudo snap install juju --classic
     sudo dpkg-reconfigure -p medium lxd
-    juju bootstrap localhost osm
+    sg lxd -c "juju bootstrap localhost osm"
     echo "Finished installation of juju"
 }
 
@@ -561,7 +561,7 @@ EONG
 function generate_docker_env_files() {
     echo "Generating docker env files"
     OSMLCM_VCA_HOST=`juju show-controller|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
-    OSMLCM_VCA_SECRET=`grep password /home/ubuntu/.local/share/juju/accounts.yaml |awk '{print $2}'`
+    OSMLCM_VCA_SECRET=`grep password ${HOME}/.local/share/juju/accounts.yaml |awk '{print $2}'`
     MYSQL_ROOT_PASSWORD=`date +%s | sha256sum | base64 | head -c 32`
     echo "OSMLCM_VCA_HOST=${OSMLCM_VCA_HOST}" |sudo tee ${OSM_DEVOPS}/installers/docker/lcm.env
     echo "OSMLCM_VCA_SECRET=${OSMLCM_VCA_SECRET}" |sudo tee -a ${OSM_DEVOPS}/installers/docker/lcm.env