Merge commit 'ef7e9aca28034ad4af52f327bd7c1a4a71730f96'

sapcc · Jul 26, 2024 · b04203a · b04203a
2 parents 8af25cc + ef7e9ac
commit b04203a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/openstack/octavia/templates/etc/_octavia.conf.tpl b/openstack/octavia/templates/etc/_octavia.conf.tpl
@@ -8,7 +8,7 @@ log_config_append = /etc/octavia/logging.ini
 octavia_plugins = f5_plugin
 
 # oslo_messaging rpc timeout
-rpc_response_timeout = {{ .Values.global.rpc_response_timeout }}
+rpc_response_timeout = {{ .Values.rpc_response_timeout | default .Values.global.rpc_response_timeout | default 60 }}
 
 # Tracing
 {{- include "osprofiler" . }}