diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-09 16:25:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-09 16:25:37 +0000 |
| commit | fb921527e5ef7aceb3d83f39d0ec246ca9a5b819 (patch) | |
| tree | 26b4ab010b6a2ef14620db2f6c5ce9d84a4e6ad7 /puppet | |
| parent | 963e1b095e3a77aeaebb9b4164871cec7122776e (diff) | |
| parent | b1fe2e8d60ad3dcfeec858539343be57115dd698 (diff) | |
Merge "Template and role support for the undercloud"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/heat-base.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 3f6dba60..a933a94b 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -57,6 +57,7 @@ outputs: heat::rabbit_port: {get_param: RabbitClientPort} heat::debug: {get_param: Debug} heat::enable_proxy_headers_parsing: true + heat::rpc_response_timeout: 600 # We need this because the default heat policy.json no longer works on TripleO # https://git.openstack.org/cgit/openstack/heat/commit/?id=ac86702172ddf01f5bdc3f3cd99d2e32ad9b7024 heat::policy::policies: @@ -77,6 +78,8 @@ outputs: heat::cron::purge_deleted::destination: '/dev/null' heat::db::database_db_max_retries: -1 heat::db::database_max_retries: -1 + heat::yaql_memory_quota: 100000 + heat::yaql_limit_iterators: 1000 service_config_settings: keystone: tripleo::profile::base::keystone::heat_admin_domain: 'heat_stack' |