From 219b9ca055e3a298331c73c144560fa01cfababb Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 17 Jun 2016 14:26:43 -0500 Subject: support the ocl and rename target to contrail again. Change-Id: I06a078854b1210e99b99c67b1b3240d88eac953a Signed-off-by: Narinder Gupta --- ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml') diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 1849f27b..3db4270e 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -3,7 +3,7 @@ trusty-mitaka-nodes: inherits: openstack-phase1 trusty-mitaka: - inherits: openstack-phase2 + inherits: contrail overrides: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 @@ -19,7 +19,6 @@ trusty-mitaka: openstack-phase1: services: - nodes: nodes: charm: "cs:trusty/ubuntu" num_units: 5 @@ -384,4 +383,3 @@ openstack-phase2: #source-branch: stable/mitaka to: - "lxc:nodes=0" - -- cgit 1.2.3-korg