openstack
/
fuel-library
Code Issues Proposed changes

Use hostname from astute for rabbitmq 

Closes-Bug: 1603782
Change-Id: I3263beee759378db664d12531ec5bb45c0ef254b
This commit is contained in:
Oleksiy Molchanov 2016-07-20 12:37:04 +03:00
parent 1d10fec0d5
commit b8b9018791
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/fuel/examples/rabbitmq.pp
View File

@ -13,6 +13,6 @@ class { 'fuel::rabbitmq':
env_config => {
'RABBITMQ_SERVER_ERL_ARGS' => "+K true +A${thread_pool_calc} +P 1048576",
'ERL_EPMD_ADDRESS' => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
'NODENAME' => "rabbit@${::hostname}",
'NODENAME' => "rabbit@${::fuel_settings['HOSTNAME']}",
},
}

2
tests/noop/spec/hosts/master/rabbitmq_spec.rb
View File

@ -26,7 +26,7 @@ describe manifest do
:env_config => {
'RABBITMQ_SERVER_ERL_ARGS' => "+K true +A#{thread_pool_calc} +P 1048576",
'ERL_EPMD_ADDRESS' => fuel_settings['ADMIN_NETWORK']['ipaddress'],
'NODENAME' => "rabbit@#{facts[:hostname]}",
'NODENAME' => "rabbit@#{fuel_settings['HOSTNAME']}",
},
}
is_expected.to contain_class('fuel::rabbitmq').with parameters