Merge "Revert "Use FQDN for rabbitmq's nodename env variable""

puppet/services/rabbitmq.yaml

@@ -73,13 +73,7 @@ outputs:
         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
+          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_kernel_variables:
           inet_dist_listen_min: '25672'