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 d5c8cc2..1dab85d 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -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
@@ -126,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.
@@ -152,7 +152,7 @@ check_status() {
     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 +161,10 @@ echo "...... deployment started ......"
 deploy
 
 check_status
+
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" || true
+./openstack.sh "$opnfvsdn" "$opnfvlab" || true
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true