Merge "Move setting of Glance's keystone region to API profile"

[apex-tripleo-heat-templates.git] / puppet / services / heat-base.yaml

diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml
index c40136f..091a4e9 100644 (file)
--- a/puppet/services/heat-base.yaml
+++ b/puppet/services/heat-base.yaml
@@ -47,7 +47,6 @@ outputs:
             value: 'role:admin'
         heat::rabbit_heartbeat_timeout_threshold: 60
         heat::keystone_tenant: 'service'
-        heat::keystone::auth::tenant: 'service'
         heat::keystone::domain::domain_name: 'heat_stack'
         heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
         heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
@@ -56,3 +55,5 @@ outputs:
         heat::cron::purge_deleted::age_type: 'days'
         heat::cron::purge_deleted::maxdelay: 3600
         heat::cron::purge_deleted::destination: '/dev/null'
+        heat::db::database_db_max_retries: -1
+        heat::db::database_max_retries: -1