From bc44a6f3e3a9a972102b76422ca83681f2c32f68 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 20 Sep 2025 10:05:14 +0900
Subject: [PATCH] Follow up "Fix missing session options for Barbican key
 manager"

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>
---
 manifests/key_manager/barbican/service_user.pp              | 6 ++++++
 spec/classes/nova_key_manager_barbican_service_user_spec.rb | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/manifests/key_manager/barbican/service_user.pp b/manifests/key_manager/barbican/service_user.pp
index 03171efca..96cbd5f34 100644
--- a/manifests/key_manager/barbican/service_user.pp
+++ b/manifests/key_manager/barbican/service_user.pp
@@ -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,
   }
 }
diff --git a/spec/classes/nova_key_manager_barbican_service_user_spec.rb b/spec/classes/nova_key_manager_barbican_service_user_spec.rb
index f4ec4f556..b8bb6453e 100644
--- a/spec/classes/nova_key_manager_barbican_service_user_spec.rb
+++ b/spec/classes/nova_key_manager_barbican_service_user_spec.rb
@@ -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',
         )
       }