trying to pass correct target for deployment.

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b81673c..c9994cc 100755 (executable)
--- 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() {
@@ -23,13 +23,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
@@ -106,6 +106,17 @@ 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
+    if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then
+        cp ~/.juju/labconfig.yaml ./labconfig.yaml
+    fi
+    if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then
+        cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+    fi
+
     #copy the script which needs to get deployed as part of ofnfv release
     echo "...... deploying now ......"
     echo "   " >> environments.yaml
@@ -121,10 +132,10 @@ deploy() {
     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.
@@ -133,7 +144,7 @@ check_status() {
     timeoutiter=0
     while [ $retval -eq 0 ]; do
        sleep 30
-       juju status > status.txt 
+       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
@@ -146,21 +157,21 @@ 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 "$opnfvlab"
-    check_status
-else
-    #create the basic data for verification of stack.
-    ./openstack.sh
-fi
+./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack" || true
+sudo ../juju/get-cloud-images || true
+../juju/joid-configure-openstack || true
 
 echo "...... finished  ......."