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=8941cdce4b0c9a8471e955b2f693bea50cdeb470;hpb=b0183f379497d9dd5c6ee9792f58b3b8290daa71;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8941cdce..d5c8cc2d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -5,11 +5,14 @@ set -ex
 #need to put mutiple cases here where decide this bundle to deploy by default use the odl bundle.
 # Below parameters are the default and we can according the release
 
-opnfvsdn=odl
+opnfvsdn=nosdn
 opnfvtype=nonha
-openstack=kilo
-opnfvlab=intelpod5
-opnfvrel=b
+openstack=mitaka
+opnfvlab=default
+opnfvrel=c
+opnfvfeature=none
+opnfvdistro=xenial
+opnfvarch=amd64
 
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
@@ -19,13 +22,16 @@ read_config() {
     opnfvsdn=`grep sdn: deploy.yaml | cut -d ":" -f2`
 }
 
-usage() { echo "Usage: $0 [-s <odl|opencontrail>]
+usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
-                         [-o <juno|kilo|liberty>]
-                         [-l <intelpod5>]
+                         [-o <juno|liberty>]
+                         [-l <default|intelpod5>]
+                         [-f <ipv6,dpdk,lxd,dvr>]
+                         [-d <trusty|xenial>]
+                         [-a <amd64>]
                          [-r <a|b>]" 1>&2 exit 1; } 
 
-while getopts ":s:t:o:l:h:r:" opt; do
+while getopts ":s:t:o:l:h:r:f:d:a:" opt; do
     case "${opt}" in
         s)
             opnfvsdn=${OPTARG}
@@ -42,6 +48,15 @@ while getopts ":s:t:o:l:h:r:" opt; do
         r)
             opnfvrel=${OPTARG}
             ;;
+        f)
+            opnfvfeature=${OPTARG}
+            ;;
+        d)
+            opnfvdistro=${OPTARG}
+            ;;
+        a)
+            opnfvarch=${OPTARG}
+            ;;
         h)
             usage
             ;;
@@ -51,38 +66,105 @@ while getopts ":s:t:o:l:h:r:" opt; do
 done
 
 deploy_dep() {
-    sudo apt-get install git -y 
     sudo apt-add-repository ppa:juju/stable -y
     sudo apt-get update
-    sudo apt-get install juju juju-deployer -y
+    sudo apt-get install juju git juju-deployer -y
     juju init -f
     cp environments.yaml ~/.juju/
 }
 
+#by default maas creates two VMs in case of three more VM needed.
+createresource() {
+    maas_ip=`grep " ip_address" deployment.yaml | cut -d " "  -f 10`
+    apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2`
+    maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
+
+    nodeexist=`maas maas nodes list hostname=node3-control`
+
+    if [ $nodeexist != *node3* ]; then
+        sudo virt-install --connect qemu:///system --name node3-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node3-control
+
+        sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control
+
+        node3controlmac=`grep  "mac address" node3-control | head -1 | cut -d "'" -f 2`
+        node4controlmac=`grep  "mac address" node4-control | head -1 | cut -d "'" -f 2`
+
+        sudo virsh -c qemu:///system define --file node3-control
+        sudo virsh -c qemu:///system define --file node4-control
+
+        controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node3-control' tags='control' hostname='node3-control' power_type='virsh' mac_addresses=$node3controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node3-control' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes control add=$controlnodeid
+
+        controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node4-control' tags='control' hostname='node4-control' power_type='virsh' mac_addresses=$node4controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node4-control' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes control add=$controlnodeid
+
+    fi
+}
+
+#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 "...... deploying now ......"
     echo "   " >> environments.yaml
     echo "        enable-os-refresh-update: false" >> environments.yaml
     echo "        enable-os-upgrade: false" >> environments.yaml
     echo "        admin-secret: admin" >> environments.yaml
-    echo "        default-series: trusty" >> environments.yaml
+    echo "        default-series: $opnfvdistro" >> environments.yaml
 
     cp environments.yaml ~/.juju/
 
-    cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
+    if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
+        createresource
+    fi
+
+    #bootstrap the node
     ./00-bootstrap.sh
 
-    #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
+    #case default deploy the opnfv platform:
+    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro
 }
 
-if [ "$#" -eq 0 ]; then
-  echo "This installtion will use deploy.yaml" 
-  read_config
-fi
+#check whether charms are still executing the code even juju-deployer says installed.
+check_status() {
+    retval=0
+    timeoutiter=0
+    while [ $retval -eq 0 ]; do
+       sleep 30
+       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
+               retval=1
+           fi
+           timeoutiter=$((timeoutiter+1))
+       else
+           retval=1
+       fi
+    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 "deploying started"
-#deploy_dep
+    echo "...... deployment finishing ......."
+}
+
+echo "...... deployment started ......"
 deploy
-echo "deploying finished"
+
+check_status
+echo "...... deployment finished  ......."
+
+./openstack.sh "$opnfvsdn" || true
+sudo ../juju/get-cloud-images || true
+../juju/joid-configure-openstack || true
+
+echo "...... finished  ......."