openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Update scenario003 to deploy separate messaging backends"

Browse Source
This commit is contained in:
Zuul
2018-07-05 07:06:59 +00:00
committed by Gerrit Code Review
parent 5a557a2d50 139b552152
commit 9b35006156
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@@ -89,7 +89,9 @@ and should be executed according to the following table:
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron-l2gw | | | | | wip | | | | | | | neutron-l2gw | | | | | wip | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| rabbitmq | | X | X | X | X | X | X | | X | X | | om-rpc | | rabbit | rabbit | amqp1 | rabbit | rabbit | rabbit | | rabbit | rabbit |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| om-notify | | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | | rabbit | rabbit |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| mongodb | | | | | | | | | | | | mongodb | | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+

6
ci/environments/scenario003-multinode-containers.yaml
View File

@@ -7,8 +7,8 @@ resource_registry:
OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml
OS::TripleO::Services::MistralEventEngine: ../../docker/services/mistral-event-engine.yaml OS::TripleO::Services::MistralEventEngine: ../../docker/services/mistral-event-engine.yaml
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/pacemaker/notify-rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
@@ -86,3 +86,5 @@ parameter_defaults:
SwiftCeilometerPipelineEnabled: false SwiftCeilometerPipelineEnabled: false
NotificationDriver: 'noop' NotificationDriver: 'noop'
NeutronPluginExtensions: qos,port_security,dns NeutronPluginExtensions: qos,port_security,dns
RpcPort: 31459
NotifyPort: 5672