X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=9d24d2f8fd21a708ca993865950e4b1245ea0c9c;hb=512a3b283ff25cad16a36605c80df4742673690b;hp=92d17e203247ce7e350a7fe3d4afc26d5a8c5977;hpb=f80c82fd5f3369e4c91d5e3836d2a68969912e27;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 92d17e20..9d24d2f8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -7,9 +7,15 @@ set -ex
 
 opnfvsdn=nosdn
 opnfvtype=nonha
-openstack=liberty
+openstack=mitaka
 opnfvlab=default
-opnfvrel=b
+opnfvrel=c
+opnfvfeature=none
+opnfvdistro=xenial
+opnfvarch=amd64
+opnfvmodel=openstack
+
+jujuver=`juju --version`
 
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
@@ -20,12 +26,16 @@ read_config() {
 }
 
 usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
-                         [-t <nonha|ha|tip>] 
+                         [-t <nonha|ha|tip>]
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
-                         [-r <a|b>]" 1>&2 exit 1; } 
+                         [-f <ipv6,dpdk,lxd,dvr>]
+                         [-d <trusty|xenial>]
+                         [-a <amd64>]
+                         [-m <openstack|kubernates>]
+                         [-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:m:" opt; do
     case "${opt}" in
         s)
             opnfvsdn=${OPTARG}
@@ -42,6 +52,18 @@ while getopts ":s:t:o:l:h:r:" opt; do
         r)
             opnfvrel=${OPTARG}
             ;;
+        f)
+            opnfvfeature=${OPTARG}
+            ;;
+        d)
+            opnfvdistro=${OPTARG}
+            ;;
+        a)
+            opnfvarch=${OPTARG}
+            ;;
+        m)
+            opnfvmodel=${OPTARG}
+            ;;
         h)
             usage
             ;;
@@ -50,80 +72,136 @@ while getopts ":s:t:o:l:h:r:" opt; do
     esac
 done
 
-deploy_dep() {
-    sudo apt-add-repository ppa:juju/stable -y
-    sudo apt-get update
-    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 --cpu host --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 --cpu host --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
+    elif [ ! -f ./environments.yaml ] && [ -e ~/joid_config/environments.yaml ]; then
+        cp ~/joid_config/environments.yaml ./environments.yaml
+    fi
+    if [ ! -f ./deployment.yaml ] && [ -e ~/.juju/deployment.yaml ]; then
+        cp ~/.juju/deployment.yaml ./deployment.yaml
+    elif [ ! -f ./deployment.yaml ] && [ -e ~/joid_config/deployment.yaml ]; then
+        cp ~/joid_config/deployment.yaml ./deployment.yaml
+    fi
+    if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then
+        cp ~/.juju/labconfig.yaml ./labconfig.yaml
+    elif [ ! -f ./labconfig.yaml ] && [ -e ~/joid_config/labconfig.yaml ]; then
+        cp ~/joid_config/labconfig.yaml ./labconfig.yaml
+    fi
+    if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then
+        cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+    elif [ ! -f ./deployconfig.yaml ] && [ -e ~/joid_config/deployconfig.yaml ]; then
+        cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml
+    fi
+
     #copy the script which needs to get deployed as part of ofnfv release
     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 environments.yaml ~/joid_config/
 
-    cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
-    ./00-bootstrap.sh
+    if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
+        createresource
+    fi
 
-    #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
-}
+    #bootstrap the node
+    ./01-bootstrap.sh
 
-check_status() {
-    while [ $? -eq 0 ]; do
-       sleep 60
-       echo " still executing the reltionship within charms ..."
-       juju status | grep executing > /dev/null
-    done
-    echo "...... deployment finishing ......."
-}
+    if [[ "$jujuver" > "2" ]]; then
+        juju model-config default-series=$opnfvdistro enable-os-refresh-update=false enable-os-upgrade=false
+    fi
 
-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
- }
-
-unitAddress()
-{
-    juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
+    #case default deploy the opnfv platform:
+    ./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro $opnfvmodel
 }
 
-createopenrc()
-{
-    mkdir -m 0700 -p cloud
+#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 120 ]; then
+               retval=1
+           fi
+           timeoutiter=$((timeoutiter+1))
+       else
+           retval=1
+       fi
+    done
 
-    controller_address=$(unitAddress keystone 0)
-    configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical 
-    chmod 0600 cloud/admin-openrc
+    if [[ "$opnfvmodel" = "openstack" ]]; then
+        juju expose ceph-radosgw || true
+        #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
+    fi
+    echo "...... deployment finishing ......."
 }
 
-if [ "$#" -eq 0 ]; then
-  echo "This installtion will use deploy.yaml" 
-  read_config
-fi
-
 echo "...... deployment started ......"
-#deploy_dep
 deploy
+
 check_status
+
 echo "...... deployment finished  ......."
 
-echo "...... creating OpenRc file for consuming by various user ......."
+if [[ "$opnfvmodel" = "openstack" ]]; then
+    ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
 
-createopenrc
+    # creating heat domain after puching the public API into /etc/hosts
 
-echo "...... finished  ......."
+    if [[ "$jujuver" > "2" ]]; then
+        status=`juju run-action heat/0 domain-setup`
+        echo $status
+    else
+        status=`juju action do heat/0 domain-setup`
+        echo $status
+    fi
 
 
+    sudo ../juju/get-cloud-images || true
+    ../juju/joid-configure-openstack || true
+
+fi
+
+echo "...... finished  ......."