openstack/puppet-glance
Code Issues Proposed changes

Use http protocol by default in auth_address for Swift backend

Browse Source 
This commit explicitly sets default protocol to http in
swift_store_auth_address variable for Swift backend, because without
any specified protocol it will use https by default. That's not
consistent with other default values for protocols in auth addresses.

Change-Id: I232536d179db92d82f1c7459a0f13e5ca5576f42
This commit is contained in:
Denis Egorenko
2016-02-26 16:05:04 +03:00
parent dff967ad98
commit b3160011aa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/backend/swift.pp
View File

@@ -12,7 +12,7 @@
# Required. Swift store key.
#
# [*swift_store_auth_address*]
# Optional. Default: '127.0.0.1:5000/v2.0/'
# Optional. Default: 'http://127.0.0.1:5000/v2.0/'
#
# [*swift_store_container*]
# Optional. Default: 'glance'
@@ -41,7 +41,7 @@
class glance::backend::swift(
$swift_store_user,
$swift_store_key,
$swift_store_auth_address = '127.0.0.1:5000/v2.0/',
$swift_store_auth_address = 'http://127.0.0.1:5000/v2.0/',
$swift_store_container = 'glance',
$swift_store_auth_version = '2',
$swift_store_large_object_size = '5120',

2
spec/classes/glance_backend_swift_spec.rb
View File

@@ -32,7 +32,7 @@ describe 'glance::backend::swift' do
is_expected.to contain_glance_swift_config('ref1/key').with_value('key')
is_expected.to contain_glance_swift_config('ref1/user').with_value('user')
is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('2')
is_expected.to contain_glance_swift_config('ref1/auth_address').with_value('127.0.0.1:5000/v2.0/')
is_expected.to contain_glance_swift_config('ref1/auth_address').with_value('http://127.0.0.1:5000/v2.0/')
end
end