summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer
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 08:48:52 -0600
commit6f217c3f6b5151546148409a28f9b14a2e3a0a61 (patch)
treec04ab3fc03c426c22ffc13d416458f038e75622a /ci/odl/juju-deployer
parentbaca8f9cb158122bbbad1c4fc49cc1cef22c834d (diff)
added the softlink to match the jenkin jobs.
added the promise integration with other bundles. Change-Id: Id53cd1d65f25bad6856abe6ef4e2cd2b10a94f92
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml5
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml5
2 files changed, 10 insertions, 0 deletions
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: