From 6f217c3f6b5151546148409a28f9b14a2e3a0a61 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 --- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 5 +++++ ci/odl/juju-deployer/ovs-odl-tip.yaml | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'ci/odl/juju-deployer') diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index f478cec9..3511c929 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -158,6 +158,11 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp options: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index f79fb4ce..341f59ac 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -161,6 +161,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" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp options: -- cgit 1.2.3-korg