12 files changed, 16 insertions, 28 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index fb3c8143..27611fe2 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -4,27 +4,23 @@ set -ex
 
 case "$1" in
     'nonha' )
-        cp nosdn/juju-deployer/ovs.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
         ;;
     'ha' )
-        cp nosdn/juju-deployer/ovs-ha.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-ha.yaml ./bundles.yaml
         ;;
     'tip' )
-        cp nosdn/juju-deployer/ovs-tip.yaml ./bundles.yaml
+        cp $4/juju-deployer/ovs-$4-tip.yaml ./bundles.yaml
         cp common/source/* ./
         sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
         ;;
     * )
-        cp nosdn/juju-deployer/ovs.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
@@ -33,58 +29,50 @@ case "$3" in
          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
          ;;
      '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
         ;;
      '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": "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
 
 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 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 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 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 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
 esac
 
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 70be7a8f..9c97b110 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -112,11 +112,11 @@ deploy() {
         createresource
     fi
 
-    cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
+    #cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
     ./00-bootstrap.sh
 
     #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
+    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn
 }
 
 #check whether charms are still executing the code even juju-deployer says installed.
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 6d273c89..6d273c89 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index b7d127d1..b7d127d1 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 25001c19..25001c19 100644
--- a/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index f478cec9..f478cec9 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index c58501a3..c58501a3 100644
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
diff --git a/ci/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 136e774b..136e774b 100644
--- a/ci/onos/juju-deployer/onos.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
diff --git a/ci/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 35d56597..35d56597 100644
--- a/ci/onos/juju-deployer/onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 90b85f68..90b85f68 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 503fb775..503fb775 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 51ce5d10..51ce5d10 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml