openstack/puppet-glance
Code Issues Proposed changes

Add endpoint type parameter

Browse Source 
To point glance swift endpoint type, one optional parameter
was added.

Change-Id: I25ce5d9d119804f1aca5b5567be46750050ebacd
Closes-Bug: #1458811
This commit is contained in:
Stanislaw Bogatkin 2015-05-13 18:27:33 +03:00
parent c76d39605f
commit 611045f213
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/backend/swift.pp
View File

@ -26,6 +26,9 @@
# [*swift_store_create_container_on_put*]
# Optional. Default: 'False'
#
# [*swift_store_endpoint_type*]
# Optional. Default: 'internalURL'
#
class glance::backend::swift(
$swift_store_user,
$swift_store_key,
@ -33,7 +36,8 @@ class glance::backend::swift(
$swift_store_container = 'glance',
$swift_store_auth_version = '2',
$swift_store_large_object_size = '5120',
$swift_store_create_container_on_put = false
$swift_store_create_container_on_put = false,
$swift_store_endpoint_type = 'internalURL'
) {
glance_api_config {
@ -47,6 +51,8 @@ class glance::backend::swift(
value => $swift_store_create_container_on_put;
'DEFAULT/swift_store_large_object_size':
value => $swift_store_large_object_size;
'glance_store/swift_store_endpoint_type':
value => $swift_store_endpoint_type;
}
glance_cache_config {

5
spec/classes/glance_backend_swift_spec.rb
View File

@ -29,6 +29,7 @@ describe 'glance::backend::swift' do
is_expected.to contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
is_expected.to contain_glance_api_config('DEFAULT/swift_store_container').with_value('glance')
is_expected.to contain_glance_api_config('DEFAULT/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')
end
it 'configures glance-cache.conf' do
@ -51,7 +52,8 @@ describe 'glance::backend::swift' do
:swift_store_large_object_size => '100',
:swift_store_auth_address => '127.0.0.2:8080/v1.0/',
:swift_store_container => 'swift',
:swift_store_create_container_on_put => true
:swift_store_create_container_on_put => true,
:swift_store_endpoint_type => 'publicURL'
}
end
@ -61,6 +63,7 @@ describe 'glance::backend::swift' do
is_expected.to contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('1')
is_expected.to contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('100')
is_expected.to contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
is_expected.to contain_glance_api_config('glance_store/swift_store_endpoint_type').with_value('publicURL')
end
it 'configures glance-cache.conf' do