openstack/tripleo-heat-templates
Code Issues Proposed changes

Make heat yaql limits configurable

Browse Source 
We need to be able to tune the yaql settings for heat on the udnercloud.
This change exposes heat's yaql limit_iterators and memory_quota
settings via HeatYaqlLimitIterators and HeatYaqlMemoryQuota. This change
also increases the default limit from 1000 to 10000 on the undercloud
installations.

Change-Id: I37669bbf642146e46388950c97ac5123c5b1180e
Closes-Bug: #1817794
This commit is contained in:
Alex Schultz 2019-02-26 14:43:06 -07:00
parent 1da8624b99
commit 1ed3d2002d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deployment/heat/heat-base-puppet.yaml
View File

@ -99,6 +99,18 @@ parameters:
description: > description: >
Cron to purge db entries marked as deleted and older than $age - Log destination Cron to purge db entries marked as deleted and older than $age - Log destination
default: '/dev/null' default: '/dev/null'
HeatYaqlLimitIterators:
type: number
description: >
The maximum number of elements in collection yaql expressions can take
for its evaluation.
default: 1000
HeatYaqlMemoryQuota:
type: number
description: >
The maximum size of memory in bytes that yaql exrpessions can take for
its evaluation.
default: 100000
HeatMaxJsonBodySize: HeatMaxJsonBodySize:
default: 4194304 default: 4194304
description: Maximum raw byte size of the Heat API JSON request body. description: Maximum raw byte size of the Heat API JSON request body.
@ -174,8 +186,8 @@ outputs:
heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost' heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
heat::db::database_db_max_retries: -1 heat::db::database_db_max_retries: -1
heat::db::database_max_retries: -1 heat::db::database_max_retries: -1
heat::yaql_memory_quota: 100000 heat::yaql_memory_quota: {get_param: HeatYaqlMemoryQuota}
heat::yaql_limit_iterators: 1000 heat::yaql_limit_iterators: {get_param: HeatYaqlLimitIterators}
heat::cors::max_age: 3600 heat::cors::max_age: 3600
heat::cors::allow_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma,X-Auth-Token' heat::cors::allow_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma,X-Auth-Token'
heat::cors::expose_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma' heat::cors::expose_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma'

1
environments/undercloud.yaml
View File

@ -82,6 +82,7 @@ parameter_defaults:
HeatMaxResourcesPerStack: -1 HeatMaxResourcesPerStack: -1
HeatMaxJsonBodySize: 4194304 HeatMaxJsonBodySize: 4194304
HeatReauthenticationAuthMethod: 'trusts' HeatReauthenticationAuthMethod: 'trusts'
HeatYaqlLimitIterators: 10000
# Disable non-lifecycle stack actions like # Disable non-lifecycle stack actions like
# snapshot, resume, cancel update and stack check. # snapshot, resume, cancel update and stack check.
HeatApiPolicies: HeatApiPolicies: