From 86710dd8b5139e6ee7d88beaf6c623086e43ba7c Mon Sep 17 00:00:00 2001 From: Samantha Jian-Pielak Date: Thu, 28 Jan 2016 13:28:13 -0800 Subject: Update OpenContrail juju-deployer yaml files to pull some charms from https://code.launchpad.net/~opnfv-team. Change-Id: I1e36a61556eed8a5ce1a90163edb8bffbb8ce79c --- ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml') 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: -- cgit 1.2.3-korg