X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fdeploy.sh;h=8cc0bd7ce3c43fa0d68b324bb67db1721d19b891;hb=1bb7f148a09b261ea0786cbc6a97abd9a629a36c;hp=6005eb1de53626a4343701e405defd384e6c3d27;hpb=e05d61903d3daaf7caa7ce1b1f225e64976075ab;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 6005eb1d..8cc0bd7c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -11,6 +11,8 @@ openstack=liberty
 opnfvlab=default
 opnfvrel=b
 opnfvfeature=odl_l2
+opnfvdistro=trusty
+opnfvarch=amd64
 
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
@@ -25,9 +27,11 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
                          [-f <ipv6|l2|l3|dvr>]
+                         [-d <trusty|xenial>]
+                         [-a <amd64>]
                          [-r <a|b>]" 1>&2 exit 1; } 
 
-while getopts ":s:t:o:l:h:r:f:" opt; do
+while getopts ":s:t:o:l:h:r:f:d:a:" opt; do
     case "${opt}" in
         s)
             opnfvsdn=${OPTARG}
@@ -47,6 +51,12 @@ while getopts ":s:t:o:l:h:r:f:" opt; do
         f)
             opnfvfeature=${OPTARG}
             ;;
+        d)
+            opnfvdistro=${OPTARG}
+            ;;
+        a)
+            opnfvarch=${OPTARG}
+            ;;
         h)
             usage
             ;;
@@ -76,15 +86,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 +100,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
 }
 
@@ -109,7 +112,7 @@ deploy() {
     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/
 
@@ -117,11 +120,11 @@ deploy() {
         createresource
     fi
 
-    #cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
+    #bootstrap the node
     ./00-bootstrap.sh
 
-    #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature
+    #case default deploy the opnfv platform:
+    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro
 }
 
 #check whether charms are still executing the code even juju-deployer says installed.
@@ -141,6 +144,8 @@ check_status() {
            retval=1
        fi
     done
+    status=`juju action do heat/0 domain-setup`
+    echo $status
     echo "...... deployment finishing ......."
 }
 
@@ -163,6 +168,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)