From 9f2d0ae85f6439841c18d694064a70a2340a4b80 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 28 Jun 2016 15:03:32 -0500 Subject: modified for nosdn timeout and OCL bundle. Change-Id: Ie7c1e64a0c85b1508113fb294394b07ff395e812 Signed-off-by: Narinder Gupta --- ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ci/opencontrail') diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 2d28e548..176e59a1 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -79,7 +79,7 @@ contrail: to: - "lxc:nodes=0" contrail-control: - charm: lcoal:trusty/contrail-control + charm: local:trusty/contrail-control to: - "lxc:nodes=1" contrail-analytics: @@ -172,8 +172,7 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" - monitor-count: 1 + monitor-count: 2 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 -- cgit 1.2.3-korg