Remove juju controller creation for LXD 08/11608/2
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 28 Jan 2022 11:22:50 +0000 (12:22 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 9 Feb 2022 08:45:20 +0000 (09:45 +0100)
Change-Id: I0d4fa2a71296658672dfbaac1a6ef6752ef1a1de
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
installers/install_juju.sh

index 72c08ce..a546637 100755 (executable)
@@ -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"