openstack
/
puppet-glance
Code Issues Proposed changes

Fix Swift store configuration 

The swift_store_config_file option is being set in the DEFAULT
group instead of the glance_store group where it is actually
defined in Glance.  This causes configuration of the Swift store
backend to fail because the configuration is not found by the
check here:
https://github.com/openstack/glance_store/blob/master/glance_store/_drivers/swift/utils.py#L66

Moving the option to glance_store makes the Swift backend work again.

Change-Id: I3af198e5015df1d626c4a5aaccb3b4e5781f56b8
Closes-Bug: 1532352
(cherry picked from commit c324788ff6)
This commit is contained in:
Ben Nemec 2016-01-08 23:07:58 +00:00 committed by Emilien Macchi
parent 4c7c407fbd
commit 66abdfea28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/backend/swift.pp
View File

@ -62,7 +62,7 @@ class glance::backend::swift(
'glance_store/swift_store_endpoint_type':
value => $swift_store_endpoint_type;
'DEFAULT/swift_store_config_file': value => '/etc/glance/glance-api.conf';
'glance_store/swift_store_config_file': value => '/etc/glance/glance-api.conf';
'glance_store/default_swift_reference': value => $default_swift_reference;
"${default_swift_reference}/user": value => $swift_store_user;
"${default_swift_reference}/key": value => $swift_store_key;

2
spec/classes/glance_backend_swift_spec.rb
View File

@ -27,7 +27,7 @@ describe 'glance::backend::swift' do
is_expected.to contain_glance_api_config('glance_store/swift_store_create_container_on_put').with_value(false)
is_expected.to contain_glance_api_config('glance_store/swift_store_endpoint_type').with_value('internalURL')
is_expected.to contain_glance_api_config('glance_store/swift_store_region').with_value(nil)
is_expected.to contain_glance_api_config('DEFAULT/swift_store_config_file').with_value('/etc/glance/glance-api.conf')
is_expected.to contain_glance_api_config('glance_store/swift_store_config_file').with_value('/etc/glance/glance-api.conf')
is_expected.to contain_glance_api_config('glance_store/default_swift_reference').with_value('ref1')
is_expected.to contain_glance_api_config('ref1/key').with_value('key')
is_expected.to contain_glance_api_config('ref1/user').with_value('user')