diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-04 22:11:34 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-04 22:12:43 -0600 |
| commit | b8f055c82d9d2e80e77d96a19068f238fd394424 (patch) | |
| tree | b20e1ed07ce9d05dcfef1281367f79cde4e9e091 /ci/nosdn | |
| parent | 9d5ca8b6a6c9e33a5f8318483ad940eb9918819d (diff) | |
modified to support the ha deployment in case of virtual machine.
Change-Id: I36969409f87d8bf3a4fabc73b0d5de22e5af9a29
Diffstat (limited to 'ci/nosdn')
| -rwxr-xr-x | ci/nosdn/01-deploybundle.sh | 8 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 4 |
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 |