summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml4
1 files changed, 1 insertions, 3 deletions
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
@@ -20,7 +20,6 @@ trusty-mitaka:
openstack-phase1:
services:
nodes:
- nodes:
charm: "cs:trusty/ubuntu"
num_units: 5
ntp:
@@ -384,4 +383,3 @@ openstack-phase2:
#source-branch: stable/mitaka
to:
- "lxc:nodes=0"
-