added the softlink to match the jenkin jobs.

added the promise integration with other bundles.

Change-Id: Id53cd1d65f25bad6856abe6ef4e2cd2b10a94f92
(cherry picked from commit 6f217c3f6b5151546148409a28f9b14a2e3a0a61)

15 files changed, 59 insertions, 0 deletions

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:
diff --git a/ci/ocl b/ci/ocl
new file mode 120000
index 00000000..0de084c0
--- /dev/null
+++ b/ci/ocl
@@ -0,0 +1 @@
+./opencontrail/
\ No newline at end of file
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:
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:
diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml
new file mode 120000
index 00000000..819993bd
--- /dev/null
+++ b/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml
@@ -0,0 +1 @@
+ovs-opencontrail-ha.yaml
\ No newline at end of file
diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml
new file mode 120000
index 00000000..dc2ea145
--- /dev/null
+++ b/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml
@@ -0,0 +1 @@
+ovs-opencontrail-nonha.yaml
\ No newline at end of file
diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml
new file mode 120000
index 00000000..509bf6cc
--- /dev/null
+++ b/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml
@@ -0,0 +1 @@
+ovs-opencontrail-tip.yaml
\ No newline at end of file
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 90b85f68..b6996d7f 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-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"
   relations:
     - [ "glance:ha", "hacluster-glance:ha" ]
     - [ "keystone:ha", "hacluster-keystone:ha" ]
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 ]
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 51ce5d10..6e1f700d 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -149,6 +149,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"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]