Merge "Align node_ips hiera keys with the service name."

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

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 67c89bb..c3a3b7a 100644 (file)
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -30,11 +30,12 @@ outputs:
   role_data:
     description: Role data for the Heat CloudFormation API role.
     value:
-      service_name: heat-api-cfn
+      service_name: heat_api_cfn
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - heat::api_cfn::workers: {get_param: HeatWorkers}
+            heat::keystone::auth_cfn::tenant: 'service'
             heat::keystone::auth_cfn::public_url: {get_param: [EndpointMap, HeatCfnPublic, uri]}
             heat::keystone::auth_cfn::internal_url: {get_param: [EndpointMap, HeatCfnInternal, uri]}
             heat::keystone::auth_cfn::admin_url: {get_param: [EndpointMap, HeatCfnAdmin, uri]}