Merge branch 'rabbitmq-priv' into 'dev'

insered a variable (default on classic hostname) in rhmk role for changing hostn…

…ame in /etc/rabbitmq/rabbitmq-env.conf

See merge request !14

manifests/profile/rabbitmq.pp

@@ -5,6 +5,7 @@ class iaas::profile::rabbitmq (
   $user = undef,
   $password = undef,
   $erlang = undef,
+  $node_hostname = $::hostname,
 ) {
   class {'erlang': } ->
   package { 'erlang-base':
@@ -21,6 +22,9 @@ class iaas::profile::rabbitmq (
     wipe_db_on_cookie_change => true,
     cluster_partition_handling => 'pause_minority',
     config_variables => { 'tcp_listen_options' => "[binary, {packet, raw}, {reuseaddr, true}, {backlog, 128}, {nodelay, true}, {exit_on_close, false}, {keepalive, true}]" },
+    environment_variables   => {
+      'NODENAME'     => "rabbit@$node_hostname",
+    },
   } ->
   rabbitmq_user { $user:
     admin => true,

manifests/role/rhmk.pp

@@ -9,6 +9,7 @@ class iaas::role::rhmk(
     $haproxy_controller_hosts = undef,
     $haproxy_controller_ips = undef,
     $vip = undef,
+    $rabbit_hostname = undef,
   ) {
   # Base
   class { 'iaas::profile::base': } ->
@@ -28,5 +29,7 @@ class iaas::role::rhmk(
     state => $keepalived_state,
     priority => $keepalived_priority,
   }
-  class { 'iaas::profile::rabbitmq': } 
+  class { 'iaas::profile::rabbitmq': 
+    node_hostname => $rabbit_hostname,
+  } 
 }