Add checking of status of local http server used to serve deb packages

[osm/devops.git] / installers / install_juju.sh

diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 7181981..25bd238 100755 (executable)
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -55,7 +55,7 @@ function juju_createcontroller_k8s(){
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     cat $HOME/.kube/config | juju add-k8s $OSM_VCA_K8S_CLOUDNAME --client \
     || FATAL "Failed to add K8s endpoint and credential for client in cloud $OSM_VCA_K8S_CLOUDNAME"
-    juju bootstrap $OSM_VCA_K8S_CLOUDNAME $OSM_STACK_NAME  \
+    juju bootstrap -v --debug $OSM_VCA_K8S_CLOUDNAME $OSM_STACK_NAME  \
             --config controller-service-type=loadbalancer \
             --agent-version=$JUJU_AGENT_VERSION \
     || FATAL "Failed to bootstrap controller $OSM_STACK_NAME in cloud $OSM_VCA_K8S_CLOUDNAME"
@@ -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
-        # Not found created, create the controller
-        sudo usermod -a -G lxd ${USER}
-        sg lxd -c "juju bootstrap --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
@@ -143,7 +131,7 @@ function juju_createproxy() {
 DEBUG_INSTALL=""
 INSTALL_CACHELXDIMAGES=""
 INSTALL_NOJUJU=""
-JUJU_AGENT_VERSION=2.9.17
+JUJU_AGENT_VERSION=2.9.29
 JUJU_VERSION=2.9
 OSM_DEVOPS=
 OSM_STACK_NAME=osm
@@ -209,7 +197,7 @@ echo "OSM_DEVOPS=$OSM_DEVOPS"
 echo "HOME=$HOME"
 
 [ -z "$INSTALL_NOJUJU" ] && install_juju
-track juju_install
+track juju juju_install_ok
 
 if [ -z "$OSM_VCA_HOST" ]; then
     if [ -z "$CONTROLLER_NAME" ]; then
@@ -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"
@@ -265,6 +252,6 @@ EOF
     [ -n "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`juju show-controller $CONTROLLER_NAME |grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
     [ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address"
 fi
-track juju_controller
+track juju juju_controller_ok