From b2aea8c07c74ea8e35ddc8d5a50beb1c4b65d04b Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 14 Jun 2016 12:22:04 -0500 Subject: remove the override series as it is controlled by juju now. Change-Id: I042d9d43c30218dfbcbc6be06fb921420eff6232 Signed-off-by: Narinder Gupta --- ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 6 +----- ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 2 +- ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'ci/opencontrail') diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index b1b69a68..6e84b6cf 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -1,8 +1,6 @@ # vim: set ts=2 et: trusty-mitaka-nodes: inherits: openstack-phase1 - overrides: - series: trusty trusty-mitaka: inherits: openstack-phase2 @@ -15,13 +13,11 @@ trusty-mitaka: region: Canonical #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" - series: trusty #ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin openstack-phase1: - series: trusty services: nodes: nodes: @@ -386,6 +382,6 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-charm: stable/mitaka + #source-charm: stable/mitaka to: - "lxc:nodes=0" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 7ed715e5..8b19ee3a 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -156,7 +156,7 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-branch: stable/mitaka + #source-branch: stable/mitaka to: - "lxc:nodes-api=0" relations: diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 401a71b9..473eb35a 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -162,7 +162,7 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-branch: stable/mitaka + #source-branch: stable/mitaka to: - "lxc:nodes-api=0" relations: -- cgit 1.2.3-korg