openstack/puppet-nova
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul
2025-09-22 22:44:33 +00:00
committed by Gerrit Code Review
parent 3eb363c317 bc44a6f3e3
commit 7c05115175
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
# Defaults to $facts['os_service_default'].
#
# [*timeout*]
# (Optional) Timeout value for connecting to barbican in seconds.
# Defaults to $facts['os_service_default']
#
# [*region_name*]
# (Optional) The region in which the identity server can be found.
# Defaults to $facts['os_service_default'].
@@ -76,6 +80,7 @@ class nova::key_manager::barbican::service_user (
$cafile = $facts['os_service_default'],
$certfile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
) {
include nova::deps
@@ -94,6 +99,7 @@ class nova::key_manager::barbican::service_user (
cafile => $cafile,
certfile => $certfile,
keyfile => $keyfile,
timeout => $timeout,
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>',
:certfile => '<SERVICE DEFAULT>',
:keyfile => '<SERVICE DEFAULT>',
:timeout => '<SERVICE DEFAULT>',
:region_name => '<SERVICE DEFAULT>',
)
}
@@ -43,6 +44,7 @@ describe 'nova::key_manager::barbican::service_user' do
:cafile => '/opt/stack/data/cafile.pem',
:certfile => 'certfile.crt',
:keyfile => 'keyfile',
:timeout => 60,
:region_name => 'regionOne',
})
end
@@ -62,6 +64,7 @@ describe 'nova::key_manager::barbican::service_user' do
:cafile => '/opt/stack/data/cafile.pem',
:certfile => 'certfile.crt',
:keyfile => 'keyfile',
:timeout => 60,
:region_name => 'regionOne',
)
}