From 09b998637dd8f399f26ed2ebcbdaadbf626bd32f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 18 Nov 2015 17:50:13 -0600 Subject: [PATCH] corrected the rabbitmq relationship Change-Id: I928da344b640561a6bdb17ec6197266f2f37c4ec Author: Narinder Gupta --- ci/odl/juju-deployer/ovs-odl-ha.yaml | 4 ++-- ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 +- ci/odl/juju-deployer/ovs-odl.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index e4fea923..f727c3ed 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -296,11 +296,11 @@ openstack-phase2: - - "ceilometer:shared-db" - "mongodb:database" - - "heat:shared-db" - - "mysql:shared-db" + - "percona-cluster:shared-db" - - "heat:identity-service" - "keystone:identity-service" - - "heat:amqp" - - "rabbitmq:amqp" + - "rabbitmq-server:amqp" trusty-liberty-nodes: inherits: openstack-phase1 overrides: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index ff9e554d..1b362d5d 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -193,7 +193,7 @@ openstack-phase2: - - "heat:identity-service" - "keystone:identity-service" - - "heat:amqp" - - "rabbitmq:amqp" + - "rabbitmq-server:amqp" trusty-liberty-nodes: inherits: openstack-phase1 overrides: diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 39a96399..3af66154 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -227,7 +227,7 @@ openstack-phase2: - - "heat:identity-service" - "keystone:identity-service" - - "heat:amqp" - - "rabbitmq:amqp" + - "rabbitmq-server:amqp" trusty-liberty-nodes: inherits: openstack-phase1 overrides: -- 2.16.6