openstack
/
puppet-heat
Code Issues Proposed changes

Add options to configure yaql settings 

Change-Id: Id41001d74ce1008dbb5a98b962d5c53dbf39c903
(cherry picked from commit 0b0f6289e1)
This commit is contained in:
Dan Prince 2016-09-27 11:05:33 -04:00
parent e1c19def2b
commit 7c2489b23c
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -290,6 +290,16 @@
# (optional) Type of authentication to use
# 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
#
# [*verbose*]
@ -408,6 +418,8 @@ class heat(
$heat_clients_url = $::os_service_default,
$purge_config = false,
$auth_strategy = 'keystone',
$yaql_memory_quota = $::os_service_default,
$yaql_limit_iterators = $::os_service_default,
# Deprecated
$verbose = undef,
$auth_uri = undef,
@ -573,6 +585,8 @@ class heat(
'DEFAULT/enable_stack_adopt': value => $enable_stack_adopt;
'ec2authtoken/auth_uri': value => $keystone_ec2_uri;
'paste_deploy/flavor': value => $flavor;
'yaql/limit_iterators': value => $yaql_limit_iterators;
'yaql/memory_quota': value => $yaql_memory_quota;
}
oslo::messaging::notifications { 'heat_config':

4
releasenotes/notes/yaql_config_options-d25ae9c0bd25706f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Allows configuration of [yaql] settings to control
memory_quota and limit_iterators settings.

10
spec/classes/heat_init_spec.rb
View File

@ -20,6 +20,8 @@ describe 'heat' do
:keystone_password => 'secretpassword',
:heat_clients_url => '<SERVICE DEFAULT>',
:purge_config => false,
:yaql_limit_iterators => 400,
:yaql_memory_quota => 20000,
}
end
@ -135,6 +137,14 @@ describe 'heat' do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( params[:keystone_ec2_uri] )
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 'configures notification_driver' do