X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_juju.sh;fp=installers%2Finstall_juju.sh;h=a5466376326ab6f0034fe470114f6b64db748f64;hb=7114cfa5ce2e800115a43df175bedd6dbb0e5f71;hp=72c08ceedbfda983c8c6d4b4efe9614768ba4847;hpb=1f2e2e981dba00a2bd37182a74e622b3eb1acdc0;p=osm%2Fdevops.git diff --git a/installers/install_juju.sh b/installers/install_juju.sh index 72c08cee..a5466376 100755 --- a/installers/install_juju.sh +++ b/installers/install_juju.sh @@ -104,18 +104,6 @@ EOF [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } -function juju_createcontroller() { - [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function - if ! juju show-controller $OSM_STACK_NAME &> /dev/null; then - # Controller not found, create the controller - sudo usermod -a -G lxd ${USER} - sg lxd -c "juju bootstrap -v --debug --bootstrap-series=xenial --agent-version=$JUJU_AGENT_VERSION $OSM_VCA_CLOUDNAME $OSM_STACK_NAME" - fi - [ $(juju controllers | awk "/^${OSM_STACK_NAME}[\*| ]/{print $1}"|wc -l) -eq 1 ] || FATAL "Juju installation failed" - juju controller-config features=[k8s-operators] - [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function -} - #Safe unattended install of iptables-persistent function check_install_iptables_persistent(){ [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function @@ -221,7 +209,6 @@ if [ -z "$OSM_VCA_HOST" ]; then juju add-cloud $OSM_VCA_CLOUDNAME $LXD_CLOUD_FILE --force || juju update-cloud $OSM_VCA_CLOUDNAME --client -f $LXD_CLOUD_FILE juju add-credential $OSM_VCA_CLOUDNAME -f $LXD_CRED_FILE || juju update-credential $OSM_VCA_CLOUDNAME lxd-cloud-creds -f $LXD_CRED_FILE fi - juju_createcontroller juju_createproxy else OSM_VCA_CLOUDNAME="lxd-cloud"