From 5b95df3ee3b9cd4a4bcc4ad49fc2d201295ac3a2 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 2 May 2016 17:35:00 -0400
Subject: Deploy RabbitMQ as a composable role

Change the way to implement RabbitMQ, as a composable role.

Implements: blueprint refactor-puppet-manifests
Change-Id: I5fed5c437ad492af75791a9163f99ae292f58895
---
 puppet/controller.yaml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'puppet/controller.yaml')

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 9f183b9c..05556ffb 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -534,14 +534,6 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
-  RabbitFDLimit:
-    default: 16384
-    description: Configures RabbitMQ FD limit
-    type: string
-  RabbitIPv6:
-    default: false
-    description: Enable IPv6 in RabbitMQ
-    type: boolean
   RedisPassword:
     type: string
     description: The password to access the Redis service
@@ -1108,8 +1100,6 @@ resources:
         rabbit_cookie: {get_param: RabbitCookie}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        rabbit_ipv6: {get_param: RabbitIPv6}
-        rabbit_fd_limit: {get_param: RabbitFDLimit}
         mongodb_no_journal: {get_param: MongoDbNoJournal}
         mongodb_ipv6: {get_param: MongoDbIPv6}
         ntp_servers: {get_param: NtpServer}
@@ -1557,14 +1547,9 @@ resources:
                 sahara::keystone::auth::admin_url: {get_input: sahara_admin_url }
                 sahara::keystone::auth::password: {get_input: sahara_password }
                 sahara::keystone::auth::region: {get_input: keystone_region}
-
-                # Rabbit
+                # RabbitMQ
                 rabbitmq::node_ip_address: {get_input: rabbitmq_network}
                 rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
-                rabbitmq::file_limit: {get_input: rabbit_fd_limit}
-                rabbitmq::default_user: {get_input: rabbit_username}
-                rabbitmq::default_pass: {get_input: rabbit_password}
-                rabbit_ipv6: {get_input: rabbit_ipv6}
                 # Redis
                 redis::bind: {get_input: redis_network}
                 redis::requirepass: {get_input: redis_password}
-- 
cgit 1.2.3-korg