openstack/puppet-nova
Code Issues Proposed changes

Follow up "Fix missing session options for Barbican key manager"

Browse Source 
Add the timeout parameter which is mentioned by the release note but
was not actually added.

Change-Id: I3b441e9565dfcb665a63329b363d7a28951d6195
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-20 10:05:14 +09:00
parent 2984b808dc
commit bc44a6f3e3
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/key_manager/barbican/service_user.pp
View File

@@ -58,6 +58,10 @@
# (Optional) Required if identity server requires client certificate # (Optional) Required if identity server requires client certificate
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
# [*timeout*]
# (Optional) Timeout value for connecting to barbican in seconds.
# Defaults to $facts['os_service_default']
#
# [*region_name*] # [*region_name*]
# (Optional) The region in which the identity server can be found. # (Optional) The region in which the identity server can be found.
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
@@ -76,6 +80,7 @@ class nova::key_manager::barbican::service_user (
$cafile = $facts['os_service_default'], $cafile = $facts['os_service_default'],
$certfile = $facts['os_service_default'], $certfile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'], $keyfile = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
@@ -94,6 +99,7 @@ class nova::key_manager::barbican::service_user (
cafile => $cafile, cafile => $cafile,
certfile => $certfile, certfile => $certfile,
keyfile => $keyfile, keyfile => $keyfile,
timeout => $timeout,
region_name => $region_name, region_name => $region_name,
} }
} }

3
spec/classes/nova_key_manager_barbican_service_user_spec.rb
View File

@@ -23,6 +23,7 @@ describe 'nova::key_manager::barbican::service_user' do
:cafile => '<SERVICE DEFAULT>', :cafile => '<SERVICE DEFAULT>',
:certfile => '<SERVICE DEFAULT>', :certfile => '<SERVICE DEFAULT>',
:keyfile => '<SERVICE DEFAULT>', :keyfile => '<SERVICE DEFAULT>',
:timeout => '<SERVICE DEFAULT>',
:region_name => '<SERVICE DEFAULT>', :region_name => '<SERVICE DEFAULT>',
) )
} }
@@ -43,6 +44,7 @@ describe 'nova::key_manager::barbican::service_user' do
:cafile => '/opt/stack/data/cafile.pem', :cafile => '/opt/stack/data/cafile.pem',
:certfile => 'certfile.crt', :certfile => 'certfile.crt',
:keyfile => 'keyfile', :keyfile => 'keyfile',
:timeout => 60,
:region_name => 'regionOne', :region_name => 'regionOne',
}) })
end end
@@ -62,6 +64,7 @@ describe 'nova::key_manager::barbican::service_user' do
:cafile => '/opt/stack/data/cafile.pem', :cafile => '/opt/stack/data/cafile.pem',
:certfile => 'certfile.crt', :certfile => 'certfile.crt',
:keyfile => 'keyfile', :keyfile => 'keyfile',
:timeout => 60,
:region_name => 'regionOne', :region_name => 'regionOne',
) )
} }