summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml6
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml2
3 files changed, 3 insertions, 7 deletions
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: