Add support for [DEFAULT] template_fetch_timeout option

Depends-on: https://review.opendev.org/914741
Change-Id: I850a399d9d0becd6018562f9a39680d741c22268
This commit is contained in:
Takashi Kajinami 2024-09-09 18:06:27 +09:00
parent abbb1a7b41
commit 8af2640adc
3 changed files with 14 additions and 0 deletions

View File

@ -136,6 +136,10 @@
# Should be larger than max_template_size.
# Defaults to $facts['os_service_default']
#
# [*template_fetch_timeout*]
# (Optional) Timeout in seconds for template download.
# Defaults to $facts['os_service_default']
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
@ -234,6 +238,7 @@ class heat(
$enable_stack_abandon = $facts['os_service_default'],
$max_template_size = $facts['os_service_default'],
$max_json_body_size = $facts['os_service_default'],
$template_fetch_timeout = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
@ -288,6 +293,7 @@ class heat(
'DEFAULT/host': value => $host;
'DEFAULT/max_template_size': value => $max_template_size;
'DEFAULT/max_json_body_size': value => $max_json_body_size;
'DEFAULT/template_fetch_timeout': value => $template_fetch_timeout;
'DEFAULT/region_name_for_services': value => $region_name;
'DEFAULT/enable_stack_abandon': value => $enable_stack_abandon;
'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt;

View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``heat::template_fetch_timeout`` parameter has been added.

View File

@ -90,6 +90,10 @@ describe 'heat' do
is_expected.to contain_heat_config('DEFAULT/max_json_body_size').with_value('<SERVICE DEFAULT>')
end
it 'configures template_fetch_timeout' do
is_expected.to contain_heat_config('DEFAULT/template_fetch_timeout').with_value('<SERVICE DEFAULT>')
end
it 'configures keystone_ec2_uri' do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( '<SERVICE DEFAULT>' )
end