X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F01-deploybundle.sh;h=f65c4dca5088d5567a254ff4f7c6586acce33028;hb=35e90150aae27ecca44d608a32206d9089621b78;hp=24e5a7a60a3a1580d56993dbab1700cd6ca3056f;hpb=ec5d3adbef189e096259f96442c83af85ff669b0;p=joid.git

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 24e5a7a6..f65c4dca 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -4,88 +4,126 @@ set -ex
 
 case "$1" in
     'nonha' )
-        cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
         ;;
     'ha' )
-        cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-ha.yaml ./bundles.yaml
         ;;
     'tip' )
-        cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml
-        cp odl/juju-deployer/source/* ./
+        cp $4/juju-deployer/ovs-$4-tip.yaml ./bundles.yaml
+        cp common/source/* ./
         sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
         ;;
     * )
-        cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
         ;;
 esac
 
 case "$3" in
     'orangepod2' )
-        cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
-        cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
-        cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
-        cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth1"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
          ;;
      'intelpod6' )
-         cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
-         cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
-         cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
-         cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "brPublic"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
+        # Provide the gateway MAC to route the traffic externally.
+         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
          ;;
      'intelpod5' )
-         cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
-         cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
-         cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
-         cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "brPublic"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.724"/g' ./bundles.yaml
+        # Provide the gateway MAC to route the traffic externally.
+         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
         ;;
      'attvirpod1' )
-         cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
-         cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
-         cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
-         cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "juju-br0"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+        ;;
+     'cengnlynxpod1' )
+        # Chose the hard drive(s) to use for CEPH OSD
+         sed -i -- 's|osd-devices: /srv|osd-devices: /dev/sdb|g' ./bundles.yaml
+        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
+         sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml
+        # choose the correct interface to use for data network
+         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 172.16.121.0\/24/g' ./bundles.yaml
+        # Choose the external port to go out from gateway to use.
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.1202"/g' ./bundles.yaml
+        ;;
+     'juniperpod1' )
+         sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+         ;;
+     'ravellodemopod' )
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
+        ;;
+     'custom' )
+         sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+        ;;
+     'default' )
+         sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+        ;;
+esac
+
+case "$5" in
+    'ipv6' )
+         sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
+        ;;
+    'dvr' )
+         sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
+         sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
+        ;;
+    'sfc' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-sfc"/g' ./bundles.yaml
+        ;;
+    'vpn' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-vpn"/g' ./bundles.yaml
+        ;;
+    'odl_l3' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-l3"/g' ./bundles.yaml
         ;;
 esac
 
 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"-nodes
+        juju-deployer -vW -d -t 7200 -r 5 -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"-nodes
+        juju-deployer -vW -d -t 7200 -r 5 -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"-nodes
+        juju-deployer -vW -d -t 7200 -r 5 -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"-nodes
+        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
 esac
 
-echo "... Deployment finished ...."
+#case "$4" in
+#    'onos' )
+#         echo "... onos prepare test ..."
+#         sleep 180s
+#         sh onos/juju_test_prepare.sh "$3"
+#        ;;
+#esac