From 249e72a62329af1fb09543abfdf8edaddf16f9a7 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 9 May 2016 22:01:06 -0600
Subject: modfied to support xenial and mutiple architecture.

Change-Id: I48e693a34ac777bdfbcb56c3cd4512699f1eb664
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/01-deploybundle.sh | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'ci/01-deploybundle.sh')

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index a4c47df9..6640ef0a 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -2,8 +2,12 @@
 #placeholder for deployment script.
 set -ex
 
-#copy and download charms
+#    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro
+
+    #copy and download charms
     cp $4/fetch-charms.sh ./fetch-charms.sh
+    #modify the ubuntu series wants to deploy
+    sed -i -- "s|trusty|$6|g" ./fetch-charms.sh
     sh ./fetch-charms.sh
 
 
@@ -27,6 +31,9 @@ esac
 #changing the target to the openstack release we want to deploy. 
 sed -i -- "s|mitaka|$2|g" ./bundles.yaml
 
+#changing the target to the ubuntu distro we want to deploy. 
+sed -i -- "s|trusty|$6|g" ./bundles.yaml
+
 case "$3" in
     'orangepod1' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -121,29 +128,6 @@ case "$5" in
 esac
 
 echo "... Deployment Started ...."
-case "$1" in
-    'nonha' )
-        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 -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 -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 -t 3600 -c bundles.yaml trusty-"$2"-nodes
-        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
-        ;;
-esac
+        juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
+        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
 
-#case "$4" in
-#    'onos' )
-#         echo "... onos prepare test ..."
-#         sleep 180s
-#         sh onos/juju_test_prepare.sh "$3"
-#        ;;
-#esac
-- 
cgit 1.2.3-korg