summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-15 08:16:38 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-15 14:54:17 +0000
commita99a08985a99eea27f8b9c08a0777a39f38af2ab (patch)
treea49863df66914c6c0296349535ce29088760449d /ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
parent5ae3485b09fc476e6c0e405906616b7de27361ff (diff)
added the softlink to match the jenkin jobs.
added the promise integration with other bundles. Change-Id: Id53cd1d65f25bad6856abe6ef4e2cd2b10a94f92 (cherry picked from commit 6f217c3f6b5151546148409a28f9b14a2e3a0a61)
Diffstat (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 503fb775..5e01c495 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -143,6 +143,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"
relations:
- [ keystone, mysql ]
- [ nova-cloud-controller, mysql ]