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/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 5 +++++ ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 5 +++++ ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'ci/nosdn') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 6d273c89..4740a676 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -85,6 +85,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" keystone: charm: cs:trusty/keystone num_units: 3 diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index b7d127d1..85cf997c 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -75,6 +75,11 @@ openstack-phase2: ha-mcastport: 5402 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" keystone: charm: cs:trusty/keystone num_units: 1 diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 25001c19..98d7ba7a 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -151,6 +151,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-openvswitch: branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk options: -- cgit 1.2.3-korg