summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-01-28 13:28:13 -0800
committerSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-01-28 13:28:57 -0800
commit86710dd8b5139e6ee7d88beaf6c623086e43ba7c (patch)
tree708a6c6c5511cb0664d8437c9e87f9f53a2bfe5f /ci
parent2190f14891c6afc2db49458995cf464c92d8a16c (diff)
Update OpenContrail juju-deployer yaml files to pull some charms from https://code.launchpad.net/~opnfv-team.
Change-Id: I1e36a61556eed8a5ce1a90163edb8bffbb8ce79c
Diffstat (limited to 'ci')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml6
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml8
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml6
3 files changed, 10 insertions, 10 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 7bdfb73f..da3a3743 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -203,7 +203,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
neutron-api:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ branch: lp:~opnfv-team/charms/trusty/neutron-api/next
num_units: 3
options:
neutron-security-groups: True
@@ -303,9 +303,9 @@ contrail:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
neutron-api-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
haproxy:
charm: cs:trusty/haproxy
num_units: 2
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 3ad1d7bf..d8d034cc 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -132,7 +132,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-api:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ branch: lp:~opnfv-team/charms/trusty/neutron-api/next
num_units: 1
options:
manage-neutron-plugin-legacy-mode: False
@@ -207,9 +207,9 @@ contrail:
to:
- "lxc:nodes-api=0"
neutron-api-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
relations:
- [ "contrail-configuration:cassandra", "cassandra:database" ]
- [ contrail-configuration, zookeeper ]
@@ -232,7 +232,7 @@ contrail:
- [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
- [ neutron-contrail, keystone ]
-trusty-liberty-nodes:
+/trusty-liberty-nodes:
inherits: openstack-phase1
series: trusty
overrides:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index be33b98c..396ba367 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -135,7 +135,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-api:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ branch: lp:~opnfv-team/charms/trusty/neutron-api/next
num_units: 1
options:
manage-neutron-plugin-legacy-mode: False
@@ -209,9 +209,9 @@ contrail:
to:
- "lxc:nodes-api=0"
neutron-api-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
- branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
+ branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
relations:
- [ "contrail-configuration:cassandra", "cassandra:database" ]
- [ contrail-configuration, zookeeper ]