Merge "M/N upgrade set scheduler_host_manager right."

[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 72f414f..226d2a5 100644 (file)
--- a/puppet/services/heat-base.yaml
+++ b/puppet/services/heat-base.yaml
@@ -26,12 +26,26 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 outputs:
   role_data:
     description: Shared role data for the Heat services.
     value:
-      service_name: heat-base
+      service_name: heat_base
       config_settings:
         heat::rabbit_userid: {get_param: RabbitUserName}
         heat::rabbit_password: {get_param: RabbitPassword}
@@ -47,7 +61,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 +69,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