more changes needed for juju 2.0

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8692df6..66a9e8f 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -14,6 +14,8 @@ opnfvfeature=none
 opnfvdistro=xenial
 opnfvarch=amd64
 
+jujuver=`juju --version`
+
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
     openstack=`grep openstack: deploy.yaml | cut -d ":" -f2`
@@ -65,14 +67,6 @@ while getopts ":s:t:o:l:h:r:f:d:a:" opt; do
     esac
 done
 
-deploy_dep() {
-    sudo apt-add-repository ppa:juju/stable -y
-    sudo apt-get update
-    sudo apt-get install juju git juju-deployer -y
-    juju init -f
-    cp environments.yaml ~/.juju/
-}
-
 #by default maas creates two VMs in case of three more VM needed.
 createresource() {
     maas_ip=`grep " ip_address" deployment.yaml | cut -d " "  -f 10`
@@ -109,12 +103,23 @@ deploy() {
 
     if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then
         cp ~/.juju/environments.yaml ./environments.yaml
+    elif [ ! -f ./environments.yaml ] && [ -e ~/joid_config/environments.yaml ]; then
+        cp ~/joid_config/environments.yaml ./environments.yaml
+    fi
+    if [ ! -f ./deployment.yaml ] && [ -e ~/.juju/deployment.yaml ]; then
+        cp ~/.juju/deployment.yaml ./deployment.yaml
+    elif [ ! -f ./deployment.yaml ] && [ -e ~/joid_config/deployment.yaml ]; then
+        cp ~/joid_config/deployment.yaml ./deployment.yaml
     fi
     if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then
         cp ~/.juju/labconfig.yaml ./labconfig.yaml
+    elif [ ! -f ./labconfig.yaml ] && [ -e ~/joid_config/labconfig.yaml ]; then
+        cp ~/joid_config/labconfig.yaml ./labconfig.yaml
     fi
     if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then
         cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+    elif [ ! -f ./deployconfig.yaml ] && [ -e ~/joid_config/deployconfig.yaml ]; then
+        cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml
     fi
 
     #copy the script which needs to get deployed as part of ofnfv release
@@ -126,6 +131,7 @@ deploy() {
     echo "        default-series: $opnfvdistro" >> environments.yaml
 
     cp environments.yaml ~/.juju/
+    cp environments.yaml ~/joid_config/
 
     if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
         createresource
@@ -147,7 +153,7 @@ check_status() {
        juju status > status.txt
        if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then
            echo " still executing the reltionship within charms ..."
-           if [ $timeoutiter -ge 60 ]; then
+           if [ $timeoutiter -ge 120 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
@@ -155,8 +161,7 @@ check_status() {
            retval=1
        fi
     done
-    status=`juju action do heat/0 domain-setup`
-    echo $status
+
     juju expose ceph-radosgw
     #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
 
@@ -170,7 +175,19 @@ check_status
 
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" "$opnfvlab" || true
+./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
+
+# creating heat domain after puching the public API into /etc/hosts
+
+if [ "$jujuver" > "2" ]; then
+    status=`juju run-action do heat/0 domain-setup`
+    echo $status
+else
+    status=`juju action do heat/0 domain-setup`
+    echo $status
+fi
+
+
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true