X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=d5c8cc2d1073dfdfe529c9598977480d2e868ba2;hb=refs%2Fchanges%2F81%2F17781%2F1;hp=c4510ab15dad560a2ae65471cc173f54897cfdbb;hpb=7208685b13a35f7f25cb4a7221058f358453cb50;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index c4510ab1..d5c8cc2d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -10,8 +10,8 @@ opnfvtype=nonha
 openstack=mitaka
 opnfvlab=default
 opnfvrel=c
-opnfvfeature=odl_l2
-opnfvdistro=trusty
+opnfvfeature=none
+opnfvdistro=xenial
 opnfvarch=amd64
 
 read_config() {
@@ -106,6 +106,11 @@ createresource() {
 #copy the files and create extra resources needed for HA deployment
 # in case of default VM labs.
 deploy() {
+
+    if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then
+        cp ~/.juju/environments.yaml ./environments.yaml
+    fi
+
     #copy the script which needs to get deployed as part of ofnfv release
     echo "...... deploying now ......"
     echo "   " >> environments.yaml
@@ -136,7 +141,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 90 ]; then
+           if [ $timeoutiter -ge 60 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
@@ -146,21 +151,20 @@ check_status() {
     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"'
+
     echo "...... deployment finishing ......."
 }
 
 echo "...... deployment started ......"
-#deploy_dep
 deploy
+
 check_status
 echo "...... deployment finished  ......."
 
-if [ "$opnfvsdn" == "onos" ]; then
-    ./openstack.sh "$opnfvsdn"
-    check_status
-else
-    #create the basic data for verification of stack.
-    ./openstack.sh
-fi
+./openstack.sh "$opnfvsdn" || true
+sudo ../juju/get-cloud-images || true
+../juju/joid-configure-openstack || true
 
 echo "...... finished  ......."