From: Guillermo Calvino <guillermo.calvino@canonical.com>
Date: Thu, 5 Jan 2023 11:20:24 +0000 (+0100)
Subject: Fix bug 2207 - Charmed installer fails when the option --small-profile is used
X-Git-Tag: release-v14.0-start~122
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=ba6b4e566c5d8ec8f09ebb75014628d37965f378

Fix bug 2207 - Charmed installer fails when the option --small-profile is used

Change-Id: Id0a13d9a053e7777b6812167d91f8c0348fc4625
Signed-off-by: Guillermo Calvino <guillermo.calvino@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 59c43977..eafbddd5 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -282,12 +282,20 @@ function deploy_charmed_osm(){
         API_SERVER="$(echo $hostport | sed -e 's,:.*,,g')"
     fi
     # Configure VCA Integrator
-    juju config vca \
-      k8s-cloud=microk8s \
-      lxd-cloud=lxd-cloud:lxd-cloud \
-      controllers="`cat ~/.local/share/juju/controllers.yaml`" \
-      accounts="`cat ~/.local/share/juju/accounts.yaml`" \
-      public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    if [ ! -v INSTALL_NOLXD ]; then
+        juju config vca \
+          k8s-cloud=microk8s \
+          lxd-cloud=lxd-cloud:lxd-cloud \
+          controllers="`cat ~/.local/share/juju/controllers.yaml`" \
+          accounts="`cat ~/.local/share/juju/accounts.yaml`" \
+          public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    else
+        juju config vca \
+          k8s-cloud=microk8s \
+          controllers="`cat ~/.local/share/juju/controllers.yaml`" \
+          accounts="`cat ~/.local/share/juju/accounts.yaml`" \
+          public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
+    fi
     # Expose OSM services
     juju config -m $MODEL_NAME nbi external-hostname=nbi.${API_SERVER}.nip.io
     juju config -m $MODEL_NAME ng-ui external-hostname=ui.${API_SERVER}.nip.io