diff --git a/manifests/api.pp b/manifests/api.pp index 73d970ee..d20ae6a9 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -204,7 +204,7 @@ # (optional) List of which store classes and store class locations are # currently known to glance at startup. # Defaults to false. -# Example: ['glance.store.filesystem.Store','glance.store.http.Store'] +# Example: ['file','http'] # # [*default_store*] # (optional) The default backend store, should be given as a string. Value @@ -265,7 +265,7 @@ # locations are currently known to glance at startup. This parameter # should be removed in the N release. # Defaults to false. -# Example: ['glance.store.filesystem.Store','glance.store.http.Store'] +# Example: ['file','http'] # class glance::api( $keystone_password, diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index d99d4587..9666bbda 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -265,44 +265,44 @@ describe 'glance::api' do describe 'with stores override' do let :params do default_params.merge({ - :default_store => 'glance.store.filesystem.Store', - :stores => ['glance.store.filesystem.Store','glance.store.http.Store'], + :default_store => 'file', + :stores => ['file','http'], :multi_store => true, }) end - it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('glance.store.filesystem.Store') } - it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('glance.store.filesystem.Store,glance.store.http.Store') } + it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('file') } + it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('file,http') } end describe 'with single store override and no default store' do let :params do default_params.merge({ - :stores => ['glance.store.filesystem.Store'], + :stores => ['file'], :multi_store => true, }) end - it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('glance.store.filesystem.Store') } - it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('glance.store.filesystem.Store') } + it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('file') } + it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('file') } end describe 'with multiple stores override and no default store' do let :params do default_params.merge({ - :stores => ['glance.store.filesystem.Store', 'glance.store.http.Store'], + :stores => ['file', 'http'], :multi_store => true, }) end - it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('glance.store.filesystem.Store') } - it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('glance.store.filesystem.Store,glance.store.http.Store') } + it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('file') } + it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('file,http') } end describe 'with both stores and known_stores provided' do let :params do default_params.merge({ - :stores => ['glance.store.filesystem.Store'], + :stores => ['file'], :known_stores => ['glance.store.http.store'], }) end @@ -313,13 +313,13 @@ describe 'glance::api' do describe 'with known_stores not set but with default_store' do let :params do default_params.merge({ - :default_store => 'glance.store.filesystem.Store', + :default_store => 'file', :multi_store => true, }) end - it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('glance.store.filesystem.Store') } - it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('glance.store.filesystem.Store') } + it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('file') } + it { is_expected.to contain_glance_api_config('glance_store/stores').with_value('file') } end describe 'while validating the service with default command' do