X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=66a9e8f83448bb67081e5b120322c8f4c0490434;hb=7ae91a059f2b498ebacc66440f5de21eea99033c;hp=d5c8cc2d1073dfdfe529c9598977480d2e868ba2;hpb=8e4c24f1fbde88a1ca508f13bb1396d10a2819f5;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index d5c8cc2d..66a9e8f8 100755
--- 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`
@@ -23,13 +25,13 @@ read_config() {
 }
 
 usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
-                         [-t <nonha|ha|tip>] 
+                         [-t <nonha|ha|tip>]
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
                          [-f <ipv6,dpdk,lxd,dvr>]
                          [-d <trusty|xenial>]
                          [-a <amd64>]
-                         [-r <a|b>]" 1>&2 exit 1; } 
+                         [-r <a|b>]" 1>&2 exit 1; }
 
 while getopts ":s:t:o:l:h:r:f:d:a:" opt; do
     case "${opt}" in
@@ -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,6 +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
@@ -120,16 +131,17 @@ deploy() {
     echo "        default-series: $opnfvdistro" >> environments.yaml
 
     cp environments.yaml ~/.juju/
+    cp environments.yaml ~/joid_config/
 
     if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
         createresource
     fi
 
     #bootstrap the node
-    ./00-bootstrap.sh
+    ./01-bootstrap.sh
 
     #case default deploy the opnfv platform:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro
+    ./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro
 }
 
 #check whether charms are still executing the code even juju-deployer says installed.
@@ -141,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))
@@ -149,10 +161,9 @@ 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"'
+    #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
 
     echo "...... deployment finishing ......."
 }
@@ -161,9 +172,22 @@ echo "...... deployment started ......"
 deploy
 
 check_status
+
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" || 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