summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canoncial.com>2015-08-29 14:31:22 -0500
committerNarinder Gupta <narinder.gupta@canoncial.com>2015-08-29 14:36:03 -0500
commitb5c5f74a35b7c2a3413bfac94811d8e6035aa3ae (patch)
tree56745cbb089883fb3c5708c654136b31bcd51fc4 /ci/deploy.sh
parent62101c28c8245ebe97c548669c27cd2899cbfbab (diff)
restructure the directory structure so that we can have directories per
SDN and then we can have same structure for new distro by adding just the yaml file. Deleted the old file structure. Change-Id: Ibd544c340fdb53813bc34ee8ff6931ed4b4dee6c JIRA:JOID-1
Diffstat (limited to 'ci/deploy.sh')
-rw-r--r--ci/deploy.sh23
1 files changed, 23 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b70a5d3e..9f263f37 100644
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+<<<<<<< HEAD
#placeholder for deployment script.
set -ex
@@ -13,3 +14,25 @@ echo "bootstrap finished"
./deployopnfv.sh
+=======
+
+set -ex
+./01-bootstrap.sh
+
+#need to put mutiple cases here where decide this bundle to deploy by default use the odl bundle.
+
+#case deploy opencontrail
+#cp ./opencontrail/01-deploybundle.sh ./01-deploybundle.sh
+
+#case deploy ODL bundle
+cp ./odl/01-deploybundle.sh ./01-deploybundle.sh
+
+#case default:
+./01-deploybundle.sh
+
+#case ha:
+#./01-deploybundle.sh ha
+
+#case tip
+#./01-deploybundle.sh tip
+>>>>>>> 3b30953... Added a script to have a openstack with odl bundle.