From: blsaws <bryan.sullivan@att.com>
Date: Mon, 13 Jun 2016 15:34:20 +0000 (-0700)
Subject: Update Congress branch to mitaka
X-Git-Tag: colorado.1.0~135
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=28166dab404f3a4948370fe880f38901515ba960;p=joid.git
Update Congress branch to mitaka
JIRA: COPPER-2
Change-Id: I870600dfce8b878619156185839d93181cf5257f
Signed-off-by: blsaws <bryan.sullivan@att.com>
---
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 3092929f..9eed91f3 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -345,6 +345,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index cac76372..320b29e9 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -268,6 +268,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=1"
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 9a24bdc3..b6f492c9 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -402,6 +402,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index d414ba09..d4ca6019 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -274,6 +274,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=1"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index e721f7de..67d2b239 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -282,6 +282,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 120ed3cd..0f8bfa80 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -363,6 +363,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 76825610..1f022c5f 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -270,6 +270,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index ff53bb4a..e574bcc6 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -274,6 +274,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes=0"
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 65c90463..7ea0576b 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -231,7 +231,7 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes-api=0"
relations:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 0f73df76..7ed715e5 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/liberty
+ 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 d69388c1..401a71b9 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/liberty
+ source-branch: stable/mitaka
to:
- "lxc:nodes-api=0"
relations: