diff options
author | Emilien Macchi <emilien@redhat.com> | 2016-05-02 17:35:00 -0400 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2016-05-18 21:43:31 +0200 |
commit | 5b95df3ee3b9cd4a4bcc4ad49fc2d201295ac3a2 (patch) | |
tree | 8b43acb5858b96ff9de740c939bc64bd501f49a1 /overcloud.yaml | |
parent | e7dc872373974c8f8976c6ef1923b37f1ba4639b (diff) |
Deploy RabbitMQ as a composable role
Change the way to implement RabbitMQ, as a composable role.
Implements: blueprint refactor-puppet-manifests
Change-Id: I5fed5c437ad492af75791a9163f99ae292f58895
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index fb1e53d0..0a9d80e5 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -298,15 +298,6 @@ parameters: default: 5672 description: Set rabbit subscriber port, change this if using SSL type: number - # We need to set this as string because 'unlimited' is a valid setting - RabbitFDLimit: - default: 16384 - description: Configures RabbitMQ FD limit - type: string - RabbitIPv6: - default: false - description: Enable IPv6 in RabbitMQ - type: boolean RedisPassword: description: The password for Redis type: string @@ -666,6 +657,7 @@ parameters: - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent + - OS::TripleO::Services::RabbitMQ description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the Controllers. @@ -958,8 +950,6 @@ resources: RabbitCookie: {get_attr: [RabbitCookie, value]} RabbitClientUseSSL: {get_param: RabbitClientUseSSL} RabbitClientPort: {get_param: RabbitClientPort} - RabbitFDLimit: {get_param: RabbitFDLimit} - RabbitIPv6: {get_param: RabbitIPv6} RedisPassword: {get_param: RedisPassword} SaharaPassword: {get_param: SaharaPassword} SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} |