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 31d435b..1dab85d 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,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.
@@ -133,7 +138,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,59 +151,21 @@ check_status() {
     done
     status=`juju action do heat/0 domain-setup`
     echo $status
-    echo "...... deployment finishing ......."
-}
-
-#create config RC file to consume by various tests.
-configOpenrc()
-{
-    echo  "  " > ./cloud/admin-openrc
-    echo  "export OS_USERNAME=$1" >> ./cloud/admin-openrc 
-    echo  "export OS_PASSWORD=$2" >> ./cloud/admin-openrc
-    echo  "export OS_TENANT_NAME=$3" >> ./cloud/admin-openrc
-    echo  "export OS_AUTH_URL=$4" >> ./cloud/admin-openrc
-    echo  "export OS_REGION_NAME=$5" >> ./cloud/admin-openrc
- }
-
-#to get the address of a service using juju
-unitAddress()
-{
-    juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
-}
-
-createopenrc()
-{
-    if [ "$opnfvsdn" == "onos" ]; then
-        sh onos/juju_test_prepare.sh "$opnfvlab"
-        check_status
-    fi
+    juju expose ceph-radosgw
+    #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
 
-    mkdir -m 0700 -p cloud
-
-    controller_address=$(unitAddress keystone 0)
-    configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical 
-    chmod 0600 cloud/admin-openrc
+    echo "...... deployment finishing ......."
 }
 
-if [ "$#" -eq 0 ]; then
-  echo "This installtion will use default options" 
-  #read_config
-fi
-
 echo "...... deployment started ......"
-#deploy_dep
 deploy
-check_status
 
-#create the basic dayta for verification of stack.
-./openstack.sh
+check_status
 
 echo "...... deployment finished  ......."
 
-echo "...... creating OpenRc file for consuming by various user ......."
-
-createopenrc
+./openstack.sh "$opnfvsdn" "$opnfvlab" || true
+sudo ../juju/get-cloud-images || true
+../juju/joid-configure-openstack || true
 
 echo "...... finished  ......."
-
-