summaryrefslogtreecommitdiffstats
path: root/ci/nosdn
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn')
-rwxr-xr-xci/nosdn/01-deploybundle.sh8
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml4
2 files changed, 5 insertions, 7 deletions
diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh
index 53c78f45..5d5b631c 100755
--- a/ci/nosdn/01-deploybundle.sh
+++ b/ci/nosdn/01-deploybundle.sh
@@ -75,19 +75,19 @@ echo "... Deployment Started ...."
case "$1" in
'nonha' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
'ha' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
'tip' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
* )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
esac
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index 2b6f5093..357349f1 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -99,11 +99,9 @@ openstack-phase2:
- "lxc:nodes-api=2"
mongodb:
charm: cs:trusty/mongodb
- num_units: 3
+ num_units: 1
to:
- "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
mysql:
charm: cs:trusty/percona-cluster
num_units: 3