diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-15 08:16:38 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-15 08:48:52 -0600 |
| commit | 6f217c3f6b5151546148409a28f9b14a2e3a0a61 (patch) | |
| tree | c04ab3fc03c426c22ffc13d416458f038e75622a /ci/opencontrail | |
| parent | baca8f9cb158122bbbad1c4fc49cc1cef22c834d (diff) | |
added the softlink to match the jenkin jobs.
added the promise integration with other bundles.
Change-Id: Id53cd1d65f25bad6856abe6ef4e2cd2b10a94f92
Diffstat (limited to 'ci/opencontrail')
6 files changed, 18 insertions, 0 deletions
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 ] |