Add support for [DEFAULT] max_cinder_api_microversion

Depends-on: https://review.opendev.org/930359
Change-Id: I217a4a1b4b8f52b451fde1b71a648a2ef7caa1ce
This commit is contained in:
Takashi Kajinami 2024-10-06 23:03:37 +09:00
parent b9d0267cc1
commit 99a65ade55
3 changed files with 14 additions and 0 deletions

View File

@ -107,6 +107,10 @@
# (Optional) Maximum nova API version for client plugin.
# Defaults to $facts['os_service_default'].
#
# [*max_cinder_api_microversion*]
# (Optional) Maximum cinder API version for client plugin.
# Defaults to $facts['os_service_default'].
#
# [*max_ironic_api_microversion*]
# (Optional) Maximum ironic API version for client plugin.
# Defaults to $facts['os_service_default'].
@ -232,6 +236,7 @@ class heat::engine (
$max_server_name_length = $facts['os_service_default'],
$max_interface_check_attempts = $facts['os_service_default'],
$max_nova_api_microversion = $facts['os_service_default'],
$max_cinder_api_microversion = $facts['os_service_default'],
$max_ironic_api_microversion = $facts['os_service_default'],
$event_purge_batch_size = $facts['os_service_default'],
$max_events_per_stack = $facts['os_service_default'],
@ -307,6 +312,7 @@ class heat::engine (
'DEFAULT/max_server_name_length': value => $max_server_name_length;
'DEFAULT/max_interface_check_attempts': value => $max_interface_check_attempts;
'DEFAULT/max_nova_api_microversion': value => $max_nova_api_microversion;
'DEFAULT/max_cinder_api_microversion': value => $max_cinder_api_microversion;
'DEFAULT/max_ironic_api_microversion': value => $max_ironic_api_microversion;
'DEFAULT/event_purge_batch_size': value => $event_purge_batch_size;
'DEFAULT/max_events_per_stack': value => $max_events_per_stack;

View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``heat::engine::max_cinder_api_microversion`` parameter has been
added.

View File

@ -19,6 +19,7 @@ describe 'heat::engine' do
:max_server_name_length => '<SERVICE DEFAULT>',
:max_interface_check_attempts => '<SERVICE DEFAULT>',
:max_nova_api_microversion => '<SERVICE DEFAULT>',
:max_cinder_api_microversion => '<SERVICE DEFAULT>',
:max_ironic_api_microversion => '<SERVICE DEFAULT>',
:event_purge_batch_size => '<SERVICE DEFAULT>',
:max_events_per_stack => '<SERVICE DEFAULT>',
@ -61,6 +62,7 @@ describe 'heat::engine' do
:max_server_name_length => 53,
:max_interface_check_attempts => 10,
:max_nova_api_microversion => '2.30',
:max_cinder_api_microversion => '3.10',
:max_ironic_api_microversion => '1.20',
:event_purge_batch_size => 200,
:max_events_per_stack => 1000,
@ -124,6 +126,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/max_server_name_length').with_value( expected_params[:max_server_name_length] ) }
it { is_expected.to contain_heat_config('DEFAULT/max_interface_check_attempts').with_value( expected_params[:max_interface_check_attempts] ) }
it { is_expected.to contain_heat_config('DEFAULT/max_nova_api_microversion').with_value( expected_params[:max_nova_api_microversion] ) }
it { is_expected.to contain_heat_config('DEFAULT/max_cinder_api_microversion').with_value( expected_params[:max_cinder_api_microversion] ) }
it { is_expected.to contain_heat_config('DEFAULT/max_ironic_api_microversion').with_value( expected_params[:max_ironic_api_microversion] ) }
it { is_expected.to contain_heat_config('DEFAULT/event_purge_batch_size').with_value( expected_params[:event_purge_batch_size] ) }
it { is_expected.to contain_heat_config('DEFAULT/max_events_per_stack').with_value( expected_params[:max_events_per_stack] ) }