X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Frabbitmq.yaml;h=879af2a13642779e888d3f3e27a1a4b3a1724d44;hb=refs%2Fheads%2Fmaster;hp=1a42fdad9002fddeb6dc7fdd4831f76eb2d7e724;hpb=f231f6a3d38b06630aaba11cec3bd32b4d1ca82c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 1a42fdad..879af2a1 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -4,6 +4,10 @@ description: >
   RabbitMQ service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -37,7 +41,7 @@ parameters:
   RabbitFDLimit:
     default: 65536
     description: Configures RabbitMQ FD limit
-    type: string
+    type: number
   RabbitIPv6:
     default: false
     description: Enable IPv6 in RabbitMQ
@@ -84,7 +88,7 @@ outputs:
                   - 25672
             rabbitmq::delete_guest_user: false
             rabbitmq::wipe_db_on_cookie_change: true
-            rabbitmq::port: '5672'
+            rabbitmq::port: 5672
             rabbitmq::package_provider: yum
             rabbitmq::package_source: undef
             rabbitmq::repos_ensure: false
@@ -93,7 +97,7 @@ outputs:
               NODE_PORT: ''
               NODE_IP_ADDRESS: ''
               RABBITMQ_NODENAME: "rabbit@%{::hostname}"
-              RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true},{raw,6,18,<<5000:64/native>>}] -kernel inet_default_listen_options [{raw,6,18,<<5000:64/native>>}]"'
+              RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true},{raw,6,18,<<15000:64/native>>}] -kernel inet_default_listen_options [{raw,6,18,<<15000:64/native>>}]"'
               'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}"
             rabbitmq_kernel_variables:
               inet_dist_listen_min: '25672'
@@ -118,7 +122,8 @@ outputs:
             rabbitmq::interface: {get_param: [ServiceNetMap, RabbitmqNetwork]}
             rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues}
             rabbitmq::ssl: {get_param: EnableInternalTLS}
-            rabbitmq::ssl_port: '5672'
+            rabbitmq::ssl_erl_dist: {get_param: EnableInternalTLS}
+            rabbitmq::ssl_port: 5672
             rabbitmq::ssl_depth: 1
             rabbitmq::ssl_only: {get_param: EnableInternalTLS}
             rabbitmq::ssl_interface: {get_param: [ServiceNetMap, RabbitmqNetwork]}