Skip to content
Snippets Groups Projects
Commit 7114cfa5 authored by garciadeblas's avatar garciadeblas
Browse files

Remove juju controller creation for LXD


Change-Id: I0d4fa2a71296658672dfbaac1a6ef6752ef1a1de
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 1f2e2e98
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment