diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-04 13:11:44 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-04 19:38:59 -0600 |
commit | 6c7fc201c56648de9622dffc48a3f47e81de9465 (patch) | |
tree | d2c9218d0da1a2f05a6058f1b0c0b83e89c49b84 /ci/01-deploybundle.sh | |
parent | b4ee809c40d27d3323bb19b4edfd188ebd0535d6 (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/01-deploybundle.sh')
-rwxr-xr-x | ci/01-deploybundle.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 24e5a7a6..fb3c8143 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -4,18 +4,18 @@ set -ex case "$1" in 'nonha' ) - cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml + cp nosdn/juju-deployer/ovs.yaml ./bundles.yaml ;; 'ha' ) - cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml + cp nosdn/juju-deployer/ovs-ha.yaml ./bundles.yaml ;; 'tip' ) - cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml - cp odl/juju-deployer/source/* ./ + cp nosdn/juju-deployer/ovs-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 nosdn/juju-deployer/ovs.yaml ./bundles.yaml ;; esac @@ -64,7 +64,7 @@ case "$3" in # 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 ;; esac @@ -88,4 +88,3 @@ case "$1" in ;; esac -echo "... Deployment finished ...." |