Add options to configure yaql settings
Change-Id: Id41001d74ce1008dbb5a98b962d5c53dbf39c903
This commit is contained in:
parent
18afefc46f
commit
0b0f6289e1
@ -290,6 +290,16 @@
|
|||||||
# (optional) Type of authentication to use
|
# (optional) Type of authentication to use
|
||||||
# Defaults to 'keystone'
|
# Defaults to 'keystone'
|
||||||
#
|
#
|
||||||
|
# [*yaql_limit_iterators*]
|
||||||
|
# (optional) The maximum number of elements YAQL collection expressions can
|
||||||
|
# take for evaluation.
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
|
# [*yaql_memory_quota*]
|
||||||
|
# (optional) The maximum size of memory in bytes that YAQL expressions can
|
||||||
|
# take for evaluation.
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*verbose*]
|
# [*verbose*]
|
||||||
@ -408,6 +418,8 @@ class heat(
|
|||||||
$heat_clients_url = $::os_service_default,
|
$heat_clients_url = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
$auth_strategy = 'keystone',
|
$auth_strategy = 'keystone',
|
||||||
|
$yaql_memory_quota = $::os_service_default,
|
||||||
|
$yaql_limit_iterators = $::os_service_default,
|
||||||
# Deprecated
|
# Deprecated
|
||||||
$verbose = undef,
|
$verbose = undef,
|
||||||
$auth_uri = undef,
|
$auth_uri = undef,
|
||||||
@ -573,6 +585,8 @@ class heat(
|
|||||||
'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt;
|
'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt;
|
||||||
'ec2authtoken/auth_uri': value => $keystone_ec2_uri;
|
'ec2authtoken/auth_uri': value => $keystone_ec2_uri;
|
||||||
'paste_deploy/flavor': value => $flavor;
|
'paste_deploy/flavor': value => $flavor;
|
||||||
|
'yaql/limit_iterators': value => $yaql_limit_iterators;
|
||||||
|
'yaql/memory_quota': value => $yaql_memory_quota;
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::messaging::notifications { 'heat_config':
|
oslo::messaging::notifications { 'heat_config':
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Allows configuration of [yaql] settings to control
|
||||||
|
memory_quota and limit_iterators settings.
|
@ -20,6 +20,8 @@ describe 'heat' do
|
|||||||
:keystone_password => 'secretpassword',
|
:keystone_password => 'secretpassword',
|
||||||
:heat_clients_url => '<SERVICE DEFAULT>',
|
:heat_clients_url => '<SERVICE DEFAULT>',
|
||||||
:purge_config => false,
|
:purge_config => false,
|
||||||
|
:yaql_limit_iterators => 400,
|
||||||
|
:yaql_memory_quota => 20000,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -135,6 +137,14 @@ describe 'heat' do
|
|||||||
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( params[:keystone_ec2_uri] )
|
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( params[:keystone_ec2_uri] )
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'configures yaql_limit_iterators' do
|
||||||
|
is_expected.to contain_heat_config('yaql/limit_iterators').with_value( params[:yaql_limit_iterators] )
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'configures yaql_memory_quota' do
|
||||||
|
is_expected.to contain_heat_config('yaql/memory_quota').with_value( params[:yaql_memory_quota] )
|
||||||
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_heat_config('paste_deploy/flavor').with_value('keystone') }
|
it { is_expected.to contain_heat_config('paste_deploy/flavor').with_value('keystone') }
|
||||||
|
|
||||||
it 'configures notification_driver' do
|
it 'configures notification_driver' do
|
||||||
|
Loading…
Reference in New Issue
Block a user