From 92d3c4932b8146803560d62b967dcc3076e3d9ab Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Mon, 13 Aug 2018 16:12:53 +0800 Subject: [PATCH] Configure access_key and secret_key as secret Change-Id: I5bfe88fcad1cc55a7182be6e29f8ae24cb8204bf --- spec/classes/nova_keystone_authtoken_spec.rb | 4 ++-- spec/classes/nova_metadata_novajoin_authtoken_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/classes/nova_keystone_authtoken_spec.rb b/spec/classes/nova_keystone_authtoken_spec.rb index d90c4417a..94b1d4a2f 100644 --- a/spec/classes/nova_keystone_authtoken_spec.rb +++ b/spec/classes/nova_keystone_authtoken_spec.rb @@ -38,7 +38,7 @@ describe 'nova::keystone::authtoken' do is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_maxsize').with_value('') is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('') is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('') - is_expected.to contain_nova_config('keystone_authtoken/memcache_secret_key').with_value('') + is_expected.to contain_nova_config('keystone_authtoken/memcache_secret_key').with_value('').with_secret(true) is_expected.to contain_nova_config('keystone_authtoken/memcache_security_strategy').with_value('') is_expected.to contain_nova_config('keystone_authtoken/memcache_use_advanced_pool').with_value('') is_expected.to contain_nova_config('keystone_authtoken/memcached_servers').with_value('') @@ -117,7 +117,7 @@ describe 'nova::keystone::authtoken' do is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize]) is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout]) is_expected.to contain_nova_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout]) - is_expected.to contain_nova_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]) + is_expected.to contain_nova_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]).with_secret(true) is_expected.to contain_nova_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy]) is_expected.to contain_nova_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) is_expected.to contain_nova_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') diff --git a/spec/classes/nova_metadata_novajoin_authtoken_spec.rb b/spec/classes/nova_metadata_novajoin_authtoken_spec.rb index 6a5715f9a..152cfa695 100644 --- a/spec/classes/nova_metadata_novajoin_authtoken_spec.rb +++ b/spec/classes/nova_metadata_novajoin_authtoken_spec.rb @@ -38,7 +38,7 @@ describe 'nova::metadata::novajoin::authtoken' do is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_maxsize').with_value('') is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('') is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('') - is_expected.to contain_novajoin_config('keystone_authtoken/memcache_secret_key').with_value('') + is_expected.to contain_novajoin_config('keystone_authtoken/memcache_secret_key').with_value('').with_secret(true) is_expected.to contain_novajoin_config('keystone_authtoken/memcache_security_strategy').with_value('') is_expected.to contain_novajoin_config('keystone_authtoken/memcache_use_advanced_pool').with_value('') is_expected.to contain_novajoin_config('keystone_authtoken/memcached_servers').with_value('') @@ -117,7 +117,7 @@ describe 'nova::metadata::novajoin::authtoken' do is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize]) is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout]) is_expected.to contain_novajoin_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout]) - is_expected.to contain_novajoin_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]) + is_expected.to contain_novajoin_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]).with_secret(true) is_expected.to contain_novajoin_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy]) is_expected.to contain_novajoin_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) is_expected.to contain_novajoin_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')