ifailed in testing moving the haproxy to openstack.sh

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index a374d39..1dab85d 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -10,7 +10,7 @@ opnfvtype=nonha
 openstack=mitaka
 opnfvlab=default
 opnfvrel=c
-opnfvfeature=odl_l2
+opnfvfeature=none
 opnfvdistro=xenial
 opnfvarch=amd64
 
@@ -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,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
@@ -121,10 +126,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.
@@ -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,23 +151,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
 
-#temporary change the user instances as dhcp failed with limitation exceeded.
-# to be remove once charm fixes the issue
-
-if [ "$opnfvdistro" == "xenial" ]; then
-    juju ssh neutron-gateway/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
-fi
-# Temorary change end
-
 check_status
+
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn"
+./openstack.sh "$opnfvsdn" "$opnfvlab" || true
+sudo ../juju/get-cloud-images || true
+../juju/joid-configure-openstack || true
 
 echo "...... finished  ......."