X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Frabbitmq.yaml;h=2c4ccbc99ae38a80000b545af017aa88888adb2a;hb=f0bed4c7e716d0427018a1246042e4cfec0c9476;hp=190487e024ad398deebe8d08d3fea3ad93ff01c4;hpb=ae1a0e6ec0f99009ae2534c382f3123b305ce39b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 190487e0..2c4ccbc9 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   RabbitMQ service configured with Puppet
@@ -69,18 +69,16 @@ outputs:
         rabbitmq::delete_guest_user: false
         rabbitmq::wipe_db_on_cookie_change: true
         rabbitmq::port: '5672'
+        rabbitmq::package_provider: yum
         rabbitmq::package_source: undef
         rabbitmq::repos_ensure: false
         rabbitmq::tcp_keepalive: true
         rabbitmq_environment:
-          RABBITMQ_NODENAME:
-            str_replace:
-              template:
-                "rabbit@%{hiera('fqdn_$NETWORK')}"
-              params:
-                $NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
-          RABBITMQ_USE_LONGNAME: true
+          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>>}]"'
+          'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}"
         rabbitmq_kernel_variables:
           inet_dist_listen_min: '25672'
           inet_dist_listen_max: '25672'
@@ -101,7 +99,7 @@ outputs:
         # internal_api -> IP
         # internal_api_uri -> [IP]
         # internal_api_subnet - > IP/CIDR
-        rabbitmq::node_ip_address: {get_param: [ServiceNetMap, RabbitmqNetwork]}
+        rabbitmq::interface: {get_param: [ServiceNetMap, RabbitmqNetwork]}
         rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues}
       step_config: |
         include ::tripleo::profile::base::rabbitmq
@@ -110,6 +108,6 @@ outputs:
           tags: step2
           service: name=rabbitmq-server state=stopped
         - name: Start rabbitmq service
-          tags: step6
+          tags: step4
           service: name=rabbitmq-server state=started