From 4261de3febfcab581f92afe4316f344af1a793d9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Jan 2024 14:37:46 +0900 Subject: [PATCH] Drop redundant default of send_service_user_token The option defaults to False, so we don't need the explicit default and can replace it by os_service_default fact. Change-Id: Iba52032d02c70258f79f0aae84a5b6059a0c1281 --- manifests/resource/service_user.pp | 4 ++-- spec/defines/keystone_resource_service_user_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/resource/service_user.pp b/manifests/resource/service_user.pp index 1893b4194..12ce8d9b7 100644 --- a/manifests/resource/service_user.pp +++ b/manifests/resource/service_user.pp @@ -35,7 +35,7 @@ # # [*send_service_user_token*] # (Optional) The service uses service token feature when this is set as true -# Defaults to false +# Defaults to $facts['os_service_default'] # # [*system_scope*] # (Optional) Scope for system operations @@ -80,7 +80,7 @@ define keystone::resource::service_user( $user_domain_name = $facts['os_service_default'], $project_domain_name = $facts['os_service_default'], $system_scope = $facts['os_service_default'], - $send_service_user_token = false, + $send_service_user_token = $facts['os_service_default'], $insecure = $facts['os_service_default'], $auth_type = $facts['os_service_default'], $auth_version = $facts['os_service_default'], diff --git a/spec/defines/keystone_resource_service_user_spec.rb b/spec/defines/keystone_resource_service_user_spec.rb index 76a3abfea..97bdc320a 100644 --- a/spec/defines/keystone_resource_service_user_spec.rb +++ b/spec/defines/keystone_resource_service_user_spec.rb @@ -20,7 +20,7 @@ describe 'keystone::resource::service_user' do is_expected.to contain_keystone_config('service_user/project_domain_name').with_value('') is_expected.to contain_keystone_config('service_user/user_domain_name').with_value('') is_expected.to contain_keystone_config('service_user/system_scope').with_value('') - is_expected.to contain_keystone_config('service_user/send_service_user_token').with_value(false) + is_expected.to contain_keystone_config('service_user/send_service_user_token').with_value('') is_expected.to contain_keystone_config('service_user/insecure').with_value('') is_expected.to contain_keystone_config('service_user/auth_type').with_value('') is_expected.to contain_keystone_config('service_user/auth_version').with_value('')