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/onos/juju-deployer/ovs-onos-ha.yaml | 5 +++++ ci/onos/juju-deployer/ovs-onos-nonha.yaml | 5 +++++ ci/onos/juju-deployer/ovs-onos-tip.yaml | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'ci/onos/juju-deployer') diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index c58501a3..77e42013 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -218,6 +218,11 @@ openstack-phase2: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=2" neutron-api-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 136e774b..28983bbe 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -152,6 +152,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-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 35d56597..11ff4717 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -156,6 +156,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-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: -- cgit 1.2.3-korg