modified to support the ha deployment in case of virtual machine.

Change-Id: I36969409f87d8bf3a4fabc73b0d5de22e5af9a29

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index 0cb513e..d334517 100644 (file)
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -8,14 +8,20 @@ set -ex
 echo " Cleanup Started ..."
 ./clean.sh
  
-virsh destroy opnfv-maas || true
-virsh destroy bootstrap || true
-virsh destroy node1-control || true
-virsh destroy node2-compute || true
-virsh undefine opnfv-maas || true
-virsh undefine bootstrap || true
-virsh undefine node1-control || true
-virsh undefine node2-compute || true
-sudo rm -rf  /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img || true
-
+ virsh destroy opnfv-maas || true
+ virsh destroy bootstrap || true
+ virsh destroy node1-control || true
+ virsh destroy node3-control || true
+ virsh destroy node4-control || true
+ virsh destroy node2-compute || true
+ virsh destroy node5-compute || true
+ virsh undefine opnfv-maas || true
+ virsh undefine bootstrap || true
+ virsh undefine node1-control || true
+ virsh undefine node3-control || true
+ virsh undefine node4-control || true
+ virsh undefine node2-compute || true
+ virsh undefine node5-compute || true
+ sudo rm -rf  /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true
+ 
 echo " Cleanup Finished ..."

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 89e18ea..28ac1b1 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -58,6 +58,45 @@ deploy_dep() {
     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
+
+        sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
+
+        node3controlmac=`grep  "mac address" node3-control | head -1 | cut -d "'" -f 2`
+        node4controlmac=`grep  "mac address" node4-control | head -1 | cut -d "'" -f 2`
+        node5computemac=`grep  "mac address" node5-compute | head -1 | cut -d "'" -f 2`
+
+        sudo virsh -c qemu:///system define --file node3-control
+        sudo virsh -c qemu:///system define --file node4-control
+        sudo virsh -c qemu:///system define --file node5-compute
+
+        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
+
+        computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes compute add=$computenodeid
+    fi
+}
+
+#copy the files and create extra resources needed for HA deployment
+# in case of default VM labs.
 deploy() {
     #copy the script which needs to get deployed as part of ofnfv release
     echo "...... deploying now ......"
@@ -69,6 +108,10 @@ deploy() {
 
     cp environments.yaml ~/.juju/
 
+    if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
+        createresource
+    fi
+
     cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
     ./00-bootstrap.sh
 
@@ -76,6 +119,7 @@ deploy() {
     ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
 }
 
+#check whether charms are still executing the code even juju-deployer says installed.
 check_status() {
     retval=0
     timeoutiter=0
@@ -95,6 +139,7 @@ check_status() {
     echo "...... deployment finishing ......."
 }
 
+#create config RC file to consume by various tests.
 configOpenrc()
 {
     echo  "  " > ./cloud/admin-openrc
@@ -105,6 +150,7 @@ configOpenrc()
     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

diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml
index d0c9e6c..482dc2c 100644 (file)
--- a/ci/maas/default/deployment.yaml
+++ b/ci/maas/default/deployment.yaml
@@ -36,7 +36,7 @@ demo-maas:
 
         # Package sources. These will be used on the MAAS controller.
         apt_sources:
-          - ppa:maas/stable
+          - ppa:maas/next
           - ppa:juju/stable
 
         # Virsh power settings
@@ -110,11 +110,11 @@ demo-maas:
               broadcast_ip: 192.168.122.255
               router_ip: 192.168.122.1
               static_range:
-                  low: 192.168.122.51
-                  high: 192.168.122.60
+                  low: 192.168.122.101
+                  high: 192.168.122.200
               dynamic_range:
                   low: 192.168.122.5
-                  high: 192.168.122.50
+                  high: 192.168.122.100
 
         # Physical nodes to be added to the MAAS cluster. Nodes will be
         # configured, commissioned and put into the Ready state so

diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh
index 53c78f4..5d5b631 100755 (executable)
--- a/ci/nosdn/01-deploybundle.sh
+++ b/ci/nosdn/01-deploybundle.sh
@@ -75,19 +75,19 @@ echo "... Deployment Started ...."
 case "$1" in
     'nonha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'ha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'tip' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     * )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
 esac
 

diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index 2b6f509..357349f 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -99,11 +99,9 @@ openstack-phase2:
         - "lxc:nodes-api=2"
     mongodb:
       charm: cs:trusty/mongodb
-      num_units: 3
+      num_units: 1
       to:
         - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     mysql:
       charm: cs:trusty/percona-cluster
       num_units: 3

diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 354082b..eca968c 100755 (executable)
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -75,19 +75,19 @@ echo "... Deployment Started ...."
 case "$1" in
     'nonha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'ha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'tip' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     * )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
 esac
 

diff --git a/ci/odl/juju-deployer/scripts/openstack.sh b/ci/odl/juju-deployer/scripts/openstack.sh
index 77f9772..e12ebbf 100755 (executable)
--- a/ci/odl/juju-deployer/scripts/openstack.sh
+++ b/ci/odl/juju-deployer/scripts/openstack.sh
@@ -21,14 +21,6 @@ unitMachine()
        juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
 }
 
-<<<<<<< HEAD
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
-=======
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
->>>>>>> 69227d1... modified the bundle to include the ceph and cinder changes.
-
 mkdir -m 0700 -p cloud
 controller_address=$(unitAddress keystone 0)
 configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc

diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh
index 118bd2e..bf7309d 100644 (file)
--- a/ci/onos/01-deploybundle.sh
+++ b/ci/onos/01-deploybundle.sh
@@ -81,19 +81,19 @@ echo "... Deployment Started ...."
 case "$1" in
     'nonha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'ha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'tip' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     * )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
 esac
 

diff --git a/ci/onos/juju-deployer/scripts/openstack.sh b/ci/onos/juju-deployer/scripts/openstack.sh
index 77f9772..e12ebbf 100644 (file)
--- a/ci/onos/juju-deployer/scripts/openstack.sh
+++ b/ci/onos/juju-deployer/scripts/openstack.sh
@@ -21,14 +21,6 @@ unitMachine()
        juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
 }
 
-<<<<<<< HEAD
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
-=======
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
->>>>>>> 69227d1... modified the bundle to include the ceph and cinder changes.
-
 mkdir -m 0700 -p cloud
 controller_address=$(unitAddress keystone 0)
 configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc

diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index f8f0fdb..19d67a6 100755 (executable)
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -76,19 +76,19 @@ echo "... Deployment Started ...."
 case "$1" in
     'nonha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'ha' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     'tip' )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
     * )
         juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
         ;;
 esac