X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=eafbddd5481287d6870df35d68a3b9c438a1b10b;hb=bb2f914425f0e7f64014d3edd6e55a83fe108975;hp=59c4397720c66362e2c0079694899668025ecc34;hpb=190380573f6ba799d51a0e6b6a58ecf35c963228;p=osm%2Fdevops.git 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