summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-01-21 17:02:25 -0800
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-22 23:53:30 +0000
commit4bd776b9001fa691284b5b60a71c7b7d89aa2500 (patch)
tree8387fbde5e72d292f5091dbe4102513892f84888 /ci
parent246ea2f77ed22ce9d171d5583029653a7f90a775 (diff)
Add juniperpod1 to 01-deploybundle.sh. Also increase the juju-deployer timeout to 3600 seconds for the first part.
Change-Id: I844438f1c43ede63945b8075f25358a28b8a02d4 (cherry picked from commit 0b5df02fcaecfa60d35db8348aa7bc770d0f8d1e)
Diffstat (limited to 'ci')
-rwxr-xr-xci/01-deploybundle.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 8164c7e7..882218cd 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -54,6 +54,10 @@ case "$3" in
sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml
sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.1202"/g' ./bundles.yaml
;;
+ 'juniperpod1' )
+ sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml
+ 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
@@ -69,19 +73,19 @@ esac
echo "... Deployment Started ...."
case "$1" in
'nonha' )
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+ 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 -c bundles.yaml trusty-"$2"-nodes
+ 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 -c bundles.yaml trusty-"$2"-nodes
+ 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 -c bundles.yaml trusty-"$2"-nodes
+ 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