From b4d5d6f595603e584dc49e9da0c702a43dbf596b Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 19 Feb 2014 12:15:43 +0100 Subject: [PATCH 1/2] [spec] Fix rspec-puppet (1.0.1) deprecation warning include_class is deprecated we must use contain_class instead Refs: #205 --- spec/classes/cloud_volume_storage_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index a0998748..71693973 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -69,7 +69,7 @@ describe 'cloud::volume::storage' do it 'configure cinder volume with rbd backend' do - should include_class('cinder::volume') + should contain_class('cinder::volume') should contain_class('cinder::volume::rbd').with( :rbd_pool => 'ceph_cinder', From 0907a60ff14648d3a8b75b89f078cdc7a721c303 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 19 Feb 2014 12:16:49 +0100 Subject: [PATCH 2/2] [spec] Fix syntax error with puppet2.7 and ruby1.8.7 Refs: #205 --- spec/classes/cloud_cache_spec.rb | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 2 +- spec/classes/cloud_telemetry_server_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/classes/cloud_cache_spec.rb b/spec/classes/cloud_cache_spec.rb index d0866d22..54a91f7d 100644 --- a/spec/classes/cloud_cache_spec.rb +++ b/spec/classes/cloud_cache_spec.rb @@ -29,7 +29,7 @@ describe 'cloud::cache' do it 'configure memcached with some params' do should contain_class('memcached').with( :listen_ip => '10.0.0.1', - :max_memory => '60%', + :max_memory => '60%' ) end end diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index bac2b6a8..d9688701 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -219,7 +219,7 @@ describe 'cloud::compute::hypervisor' do should contain_class('nova::compute::libvirt').with( :libvirt_type => 'kvm', :vncserver_listen => '0.0.0.0', - :migration_support => true, + :migration_support => true ) end diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb index 5222e13f..6ee574c2 100644 --- a/spec/classes/cloud_telemetry_server_spec.rb +++ b/spec/classes/cloud_telemetry_server_spec.rb @@ -102,7 +102,7 @@ describe 'cloud::telemetry::server' do should contain_class('ceilometer::expirer').with( :time_to_live => '2592000', :minute => '0', - :hour => '0', + :hour => '0' ) end