Merge "cache: Support array value for tls_allowed_ciphers"

openstack/puppet-oslo

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2022年11月30日 05:08:48 +00:00

committed by Gerrit Code Review

parent 6f502efdc1 0532649275

commit 978b7ef3cf

2 changed files with 9 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/cache.pp

View File

@@ -306,7 +306,7 @@ define oslo::cache(

'cache/tls_cafile'=>{ value => $tls_cafile },

'cache/tls_certfile'=>{ value => $tls_certfile },

'cache/tls_keyfile'=>{ value => $tls_keyfile },

'cache/tls_allowed_ciphers'=>{ value => $tls_allowed_ciphers },

'cache/tls_allowed_ciphers'=>{ value => join(any2array($tls_allowed_ciphers), ':') },

'cache/enable_retry_client'=>{ value => $enable_retry_client },

'cache/retry_attempts'=>{ value => $retry_attempts },

'cache/retry_delay'=>{ value => $retry_delay },

16
spec/defines/oslo_cache_spec.rb

View File

@@ -60,10 +60,10 @@ describe 'oslo::cache' do

:memcache_pool_unused_timeout => '60',

:memcache_pool_connection_get_timeout => '10',

:tls_enabled => false,

:tls_cafile => nil,

:tls_certfile => nil,

:tls_keyfile => nil,

:tls_allowed_ciphers => nil,

:tls_cafile => '/path/to/ssl/cafile',

:tls_certfile => '/path/to/ssl/certfile',

:tls_keyfile => '/path/to/ssl/keyfile',

:tls_allowed_ciphers => ['CIPHER_A', 'CIPHER_B'],

:enable_retry_client => false,

:retry_attempts => 2,

:retry_delay => 0,

@@ -92,10 +92,10 @@ describe 'oslo::cache' do

is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('60')

is_expected.to contain_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('10')

is_expected.to contain_keystone_config('cache/tls_enabled').with_value('false')

is_expected.to contain_keystone_config('cache/tls_cafile').with_value('nil')

is_expected.to contain_keystone_config('cache/tls_certfile').with_value('nil')

is_expected.to contain_keystone_config('cache/tls_keyfile').with_value('nil')

is_expected.to contain_keystone_config('cache/tls_allowed_ciphers').with_value('nil')

is_expected.to contain_keystone_config('cache/tls_cafile').with_value('/path/to/ssl/cafile')

is_expected.to contain_keystone_config('cache/tls_certfile').with_value('/path/to/ssl/certfile')

is_expected.to contain_keystone_config('cache/tls_keyfile').with_value('/path/to/ssl/keyfile')

is_expected.to contain_keystone_config('cache/tls_allowed_ciphers').with_value('CIPHER_A:CIPHER_B')

is_expected.to contain_keystone_config('cache/enable_retry_client').with_value('false')

is_expected.to contain_keystone_config('cache/retry_attempts').with_value('2')

is_expected.to contain_keystone_config('cache/retry_delay').with_value('0')