summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/01-deploybundle.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-04 13:11:44 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-12-04 19:38:59 -0600
commit6c7fc201c56648de9622dffc48a3f47e81de9465 (patch)
treed2c9218d0da1a2f05a6058f1b0c0b83e89c49b84 /ci/opencontrail/01-deploybundle.sh
parentb4ee809c40d27d3323bb19b4edfd188ebd0535d6 (diff)
modified to comment the use of juju-br0 as external network.
Added option to install neutron-openswitch without ODL. consolidated source files to common as all sdn share the s same source for openstack and it can be modified during deployment. Change-Id: I1df7f5cd5d928d170bc6be6b32c3404dbcb5fda3
Diffstat (limited to 'ci/opencontrail/01-deploybundle.sh')
-rwxr-xr-xci/opencontrail/01-deploybundle.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index f9268b69..90f43a9a 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -11,7 +11,7 @@ case "$1" in
;;
'tip' )
cp opencontrail/juju-deployer/contrail-tip.yaml ./bundles.yaml
- cp opencontrail/juju-deployer/source/* ./
+ cp common/source/* ./
sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
;;
* )
@@ -62,9 +62,9 @@ case "$3" in
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.1.1/g' ./bundles.yaml
+ 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
;;
esac
@@ -88,4 +88,3 @@ case "$1" in
;;
esac
-echo "... Deployment finished ...."