From 611045f2137f7ba14e639a73ee2f70870de31876 Mon Sep 17 00:00:00 2001 From: Stanislaw Bogatkin Date: Wed, 13 May 2015 18:27:33 +0300 Subject: [PATCH] Add endpoint type parameter To point glance swift endpoint type, one optional parameter was added. Change-Id: I25ce5d9d119804f1aca5b5567be46750050ebacd Closes-Bug: #1458811 --- manifests/backend/swift.pp | 8 +++++++- spec/classes/glance_backend_swift_spec.rb | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp index 4da76d49..0a243597 100644 --- a/manifests/backend/swift.pp +++ b/manifests/backend/swift.pp @@ -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 { diff --git a/spec/classes/glance_backend_swift_spec.rb b/spec/classes/glance_backend_swift_spec.rb index fc758456..d9e3b221 100644 --- a/spec/classes/glance_backend_swift_spec.rb +++ b/spec/classes/glance_backend_swift_spec.rb @@ -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