diff options
| author |   Brent Eagles <beagles@redhat.com> | 2016-10-14 16:35:44 -0230 |
|---|---|---|
| committer | Brent Eagles <beagles@redhat.com> | 2016-10-17 14:31:15 -0230 |
| commit | 597194a4199b34e1389b26f080ae1fefccbca924 (patch) | |
| tree | 945c8639780c1ad252a565810ea1df6c757ac770 /spec/classes | |
| parent | b54e9c3a05f9bf5870e7bb98b2a8322640a6c847 (diff) | |
Add port to rabbitmq node ip list
We use the rabbit_hosts configuration for most of our services but we
haven't been adding the configured port. This patch appends the IP port
used provided to the service's heat template to the IPs in the list.
Note: while we could use the value set for the rabbitmq server in
rabbitmq::port, it doesn't allow for dealing with SSL. This also is also
backwards compatible with the RabbitClientPort parameters used in the
heat templates.
Change-Id: I0000f039144a6b0e98c0a148dc69324f60db3d8b
Closes-Bug: #1633580
Diffstat (limited to 'spec/classes')
| -rw-r--r-- | spec/classes/tripleo_profile_base_aodh_spec.rb | 4 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_ceilometer_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb index 10c17eb..dd6554e 100644 --- a/spec/classes/tripleo_profile_base_aodh_spec.rb +++ b/spec/classes/tripleo_profile_base_aodh_spec.rb @@ -39,7 +39,7 @@ describe 'tripleo::profile::base::aodh' do it 'should trigger complete configuration' do is_expected.to contain_class('aodh').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" } ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') @@ -72,7 +72,7 @@ describe 'tripleo::profile::base::aodh' do it 'should trigger aodh configuration without mysql grant' do is_expected.to contain_class('aodh').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" } ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb index 73fb41b..5510f4b 100644 --- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb +++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb @@ -35,7 +35,7 @@ describe 'tripleo::profile::base::ceilometer' do it 'should trigger complete configuration' do is_expected.to contain_class('ceilometer').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map{ |h| h + ':5672' } ) is_expected.to contain_class('ceilometer::config') end |