From bd20ecd41603de7339946563514280511e79d1c8 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 15 Dec 2014 18:38:30 -0500 Subject: [PATCH] Update rspec to pass stable/juno Glance API unit tests could not pass rspec because the configuration file has changed in stable/juno puppet upstream. This patch aims to fix it. Change-Id: I2a00eb990b70af5e5febedf7ffe3a9ef50463b37 --- spec/classes/cloud_image_api_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/classes/cloud_image_api_spec.rb b/spec/classes/cloud_image_api_spec.rb index e50940a7..a28f95f2 100644 --- a/spec/classes/cloud_image_api_spec.rb +++ b/spec/classes/cloud_image_api_spec.rb @@ -106,8 +106,8 @@ describe 'cloud::image::api' do it 'configure Glance with file backend' do is_expected.to contain_class('glance::backend::file') is_expected.not_to contain_class('glance::backend::rbd') - is_expected.to contain_glance_api_config('DEFAULT/filesystem_store_datadir').with('value' => '/var/lib/glance/images/') - is_expected.to contain_glance_api_config('DEFAULT/default_store').with('value' => 'file') + is_expected.to contain_glance_api_config('glance_store/filesystem_store_datadir').with('value' => '/var/lib/glance/images/') + is_expected.to contain_glance_api_config('glance_store/default_store').with('value' => 'file') end end @@ -122,8 +122,8 @@ describe 'cloud::image::api' do it 'configure Glance with NFS backend' do is_expected.to contain_class('glance::backend::file') is_expected.not_to contain_class('glance::backend::rbd') - is_expected.to contain_glance_api_config('DEFAULT/filesystem_store_datadir').with('value' => '/srv/images/') - is_expected.to contain_glance_api_config('DEFAULT/default_store').with('value' => 'file') + is_expected.to contain_glance_api_config('glance_store/filesystem_store_datadir').with('value' => '/srv/images/') + is_expected.to contain_glance_api_config('glance_store/default_store').with('value' => 'file') is_expected.to contain_mount('/srv/images/').with({ 'ensure' => 'mounted', 'fstype' => 'nfs', @@ -141,10 +141,10 @@ describe 'cloud::image::api' do it 'configure Glance with Glance backend' do is_expected.not_to contain_class('glance::backend::file') is_expected.not_to contain_class('glance::backend::rbd') - is_expected.to contain_glance_api_config('DEFAULT/default_store').with('value' => 'swift') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_user').with('value' => 'services:glance') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_key').with('value' => 'secrete') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_auth_address').with('value' => 'https://10.0.0.1:35357/v2.0/') + is_expected.to contain_glance_api_config('glance_store/default_store').with('value' => 'swift') + is_expected.to contain_glance_api_config('glance_store/swift_store_user').with('value' => 'services:glance') + is_expected.to contain_glance_api_config('glance_store/swift_store_key').with('value' => 'secrete') + is_expected.to contain_glance_api_config('glance_store/swift_store_auth_address').with('value' => 'https://10.0.0.1:35357/v2.0/') is_expected.to contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with('value' => true) end end