summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-14 19:27:27 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-15 00:41:05 -0500
commit7208685b13a35f7f25cb4a7221058f358453cb50 (patch)
tree4b34bf24a7d1ed8213318aec4a173284f9aab6f8 /ci/opencontrail/juju-deployer
parentb2aea8c07c74ea8e35ddc8d5a50beb1c4b65d04b (diff)
modified to clean the environment and also change in bundles to
deploy ocl as well. Change-Id: I40f32bad5b94b335bd5bd37d3c626d4a5e336061 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 6e84b6cf..1849f27b 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -260,7 +260,6 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: ""
monitor-count: 3
# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
@@ -382,6 +381,7 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- #source-charm: stable/mitaka
+ #source-branch: stable/mitaka
to:
- "lxc:nodes=0"
+