Added packaging support for Trixie under 'debian/trixie/'. This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. facter puppet-ceph puppet-keystone puppet-horizon puppet-openstacklib puppet-oslo puppet-boolean puppet-dnsmasq puppet-drbd puppet-etcd puppetlabs-haproxy puppetlabs-postgresql puppetlabs-stdlib puppet-hash2stuff puppet-lvm puppet-memcached puppet-network puppet-puppi puppet-rabbitmq puppet-staging puppet-vswitch puppet-zitrlp-strongswan Story: 2011360 Task: 53245 Change-Id: Id877ddc73835f0c3adeaae3a304dc5eb6f1c8274 Signed-off-by: pmp1 <preetham.mp@windriver.com> Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
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
|
|
|