diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/classes/tripleo_packages_spec.rb | 5 | ||||
-rw-r--r-- | spec/classes/tripleo_profile_base_aodh_spec.rb | 4 | ||||
-rw-r--r-- | spec/classes/tripleo_profile_base_ceilometer_spec.rb | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/spec/classes/tripleo_packages_spec.rb b/spec/classes/tripleo_packages_spec.rb index 076d9cd..8db238a 100644 --- a/spec/classes/tripleo_packages_spec.rb +++ b/spec/classes/tripleo_packages_spec.rb @@ -29,9 +29,8 @@ describe 'tripleo::packages' do } end - it 'should contain correct upgrade ordering' do - is_expected.to contain_exec('package-upgrade').that_comes_before('Service[nova-compute]') - is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update') + it 'should contain upgrade exec' do + is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update') end end 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 |