summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-10 08:09:50 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-10 08:23:07 -0500
commit6635edf1ab2858d2a8b058450aecad6a9d9c5d88 (patch)
tree74ce91934b1e5f3186f9fe3dddde3f2bf376be76 /ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
parent7a8e2d62c4a16821ec46ab21445a7ebc702e0154 (diff)
modfied to include the congress charm which is part of OPNFV bundle
now. Change-Id: Ifd91c3af7985cbc0ea5e4f4c08bbcdcec8ea3ba9 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml12
1 files changed, 12 insertions, 0 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index c792310a..401a71b9 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -159,6 +159,12 @@ openstack-phase2:
num_units: 1
to:
- "lxc:nodes-api=0"
+ congress:
+ charm: local:trusty/congress
+ options:
+ source-branch: stable/mitaka
+ to:
+ - "lxc:nodes-api=0"
relations:
- [ keystone, mysql ]
- [ nova-cloud-controller, mysql ]
@@ -195,6 +201,12 @@ openstack-phase2:
- [ "cinder:shared-db", "mysql:shared-db" ]
- [ "ceph:client", "cinder-ceph:ceph" ]
- [ "ceph:client", "glance:ceph" ]
+ - - congress:shared-db
+ - mysql:shared-db
+ - - congress:identity-service
+ - keystone:identity-service
+ - - congress:amqp
+ - rabbitmq-server:amqp
contrail:
inherits: openstack-phase2
services: