From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 24 May 2018 08:48:59 +0000 (+0200)
Subject: fix in juju commands to run as part of lxd group
X-Git-Tag: v4.0.1~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f79d16388f1dfa87724fed38fcbc8911b5c28e8c;p=osm%2Fdevops.git

fix in juju commands to run as part of lxd group

Change-Id: I2f3a2a2c116492b95147bc81204729d20870587f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 3e0172eb..f0627c79 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -548,7 +548,7 @@ function install_juju() {
     sudo snap install juju --classic
     sudo dpkg-reconfigure -p medium lxd
     sg lxd -c "juju bootstrap --bootstrap-series=xenial localhost osm"
-    [ $(juju status |grep "osm" |wc -l) -eq 1 ] || FATAL "Juju installation failed"
+    [ $(sg lxd -c "juju status" |grep "osm" |wc -l) -eq 1 ] || FATAL "Juju installation failed"
     echo "Finished installation of juju"
 }
 
@@ -590,7 +590,7 @@ function generate_config_log_folders() {
 
 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_HOST=`sg lxd -c "juju show-controller"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
     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