starlingx
/
integ
Code Issues Proposed changes

Merge "Debian: Replace deprecated idle_timeout parm on keystone"

This commit is contained in:
Zuul 2022-03-18 18:00:31 +00:00 committed by Gerrit Code Review
parent 75e3878176 6442a6e56f
commit 9d03b61a58
4 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
config/puppet-modules/openstack/puppet-keystone-17.4.0/debian/patches/0005-Replace-deprecated-idle_timeout-parameter.patch Normal file
View File

@ -0,0 +1,42 @@
From 656ae78a46ec5137c88d817d26e1e57ccf02600e Mon Sep 17 00:00:00 2001
From: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
Date: Thu, 10 Mar 2022 16:59:35 +0000
Subject: [PATCH] Replace deprecated idle_timeout parameter
Replace idle_timeout parameter by connection_recycle_time
Signed-off-by: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
---
manifests/messaging/amqp.pp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp
index 440ff97..69da95e 100644
--- a/manifests/messaging/amqp.pp
+++ b/manifests/messaging/amqp.pp
@@ -50,14 +50,14 @@ class keystone::messaging::amqp(
include keystone::deps
oslo::messaging::amqp { 'keystone_config':
- pre_settled => $amqp_pre_settled,
- idle_timeout => $amqp_idle_timeout,
- ssl_ca_file => $amqp_ssl_ca_file,
- ssl_cert_file => $amqp_ssl_cert_file,
- ssl_key_file => $amqp_ssl_key_file,
- ssl_key_password => $amqp_ssl_key_password,
- allow_insecure_clients => $amqp_allow_insecure_clients,
- sasl_mechanisms => $amqp_sasl_mechanisms,
+ pre_settled => $amqp_pre_settled,
+ connection_recycle_time => $amqp_idle_timeout,
+ ssl_ca_file => $amqp_ssl_ca_file,
+ ssl_cert_file => $amqp_ssl_cert_file,
+ ssl_key_file => $amqp_ssl_key_file,
+ ssl_key_password => $amqp_ssl_key_password,
+ allow_insecure_clients => $amqp_allow_insecure_clients,
+ sasl_mechanisms => $amqp_sasl_mechanisms,
}
}
--
2.30.2

1
config/puppet-modules/openstack/puppet-keystone-17.4.0/debian/patches/series
View File

@ -2,3 +2,4 @@
0002-Add-support-for-fernet-receipts.patch
0003-Update-Barbican-admin-secret-s-user-project-IDs-duri.patch
0004-Update-puppet-keystone-sync.patch
0005-Replace-deprecated-idle_timeout-parameter.patch

26
config/puppet-modules/openstack/puppet-oslo-17.4.0/debian/patches/0003-Deactivate-deprecated-idle_timeout-parameter.patch Normal file
View File

@ -0,0 +1,26 @@
From 3e1cab8f80105f32d7bc69ccfaf485bdacdba53d Mon Sep 17 00:00:00 2001
From: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
Date: Thu, 10 Mar 2022 17:12:42 +0000
Subject: [PATCH] Deactivate deprecated 'idle_timeout' parameter
Signed-off-by: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
---
manifests/db.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/db.pp b/manifests/db.pp
index 697c1d1..77f9249 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -147,7 +147,7 @@ define oslo::db(
$use_tpool = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
# DEPRCATED PARAMETERS
- $idle_timeout = $::os_service_default,
+ $idle_timeout = undef,
$min_pool_size = undef,
) {
--
2.30.2

1
config/puppet-modules/openstack/puppet-oslo-17.4.0/debian/patches/series
View File

@ -1,2 +1,3 @@
0001-Remove-log_dir-from-conf-files.patch
0002-Add-psycopg2-drivername-to-postgresql-settings.patch
0003-Deactivate-deprecated-idle_timeout-parameter.patch