From a99a08985a99eea27f8b9c08a0777a39f38af2ab Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 15 Jan 2016 08:16:38 -0600 Subject: added the softlink to match the jenkin jobs. added the promise integration with other bundles. Change-Id: Id53cd1d65f25bad6856abe6ef4e2cd2b10a94f92 (cherry picked from commit 6f217c3f6b5151546148409a28f9b14a2e3a0a61) --- ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml') diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 51ce5d10..6e1f700d 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -149,6 +149,11 @@ openstack-phase2: openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] -- cgit 1.2.3-korg