Set osd-devices for CENGN Lynx Pod 1

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 63d550a..6e82d08 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -76,15 +76,11 @@ createresource() {
 
         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 --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 `
 
@@ -94,9 +90,6 @@ createresource() {
 
         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
 }
 
@@ -110,7 +103,6 @@ deploy() {
     echo "        enable-os-upgrade: false" >> environments.yaml
     echo "        admin-secret: admin" >> environments.yaml
     echo "        default-series: trusty" >> environments.yaml
-    echo "        address-allocation: true" >> environments.yaml
 
     cp environments.yaml ~/.juju/
 
@@ -142,6 +134,8 @@ check_status() {
            retval=1
        fi
     done
+    status=`juju action do heat/0 domain-setup`
+    echo $status
     echo "...... deployment finishing ......."
 }
 
@@ -164,6 +158,11 @@ unitAddress()
 
 createopenrc()
 {
+    if [ "$opnfvsdn" == "onos" ]; then
+        sh onos/juju_test_prepare.sh "$opnfvlab"
+        check_status
+    fi
+
     mkdir -m 0700 -p cloud
 
     controller_address=$(unitAddress keystone 0)