summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-14 22:57:35 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-14 22:57:35 -0600
commitbaca8f9cb158122bbbad1c4fc49cc1cef22c834d (patch)
tree01bf1e3507180d3b659bcba58434884fdcb8155a /ci
parentb6ed3294f42593bc3bc45414965ba3e62b53b903 (diff)
Integration the promise into bundle as experimental for odl ha.
Change-Id: I7d19ad716f6dde575fbbd04d5e0955c1177b502e JIRA: JOID-43
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 144bb1dd..82efddd2 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -221,6 +221,11 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
+ num_units: 1
+ to:
+ - "lxc:nodes-api=2"
neutron-api-odl:
branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
options: