Merge "Make the CloudDomain defaults match the doc strings"

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

diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index 2ea96fc..b0cd16d 100644 (file)
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@@ -76,9 +76,11 @@ outputs:
         include ::tripleo::profile::base::heat::api
       service_config_settings:
         keystone:
-          heat::keystone::auth::tenant: 'service'
-          heat::keystone::auth::public_url: {get_param: [EndpointMap, HeatPublic, uri]}
-          heat::keystone::auth::internal_url: {get_param: [EndpointMap, HeatInternal, uri]}
-          heat::keystone::auth::admin_url: {get_param: [EndpointMap, HeatAdmin, uri]}
-          heat::keystone::auth::password: {get_param: HeatPassword}
-          heat::keystone::auth::region: {get_param: KeystoneRegion}
+          map_merge:
+            - get_attr: [HeatBase, role_data, service_config_settings, keystone]
+            - heat::keystone::auth::tenant: 'service'
+              heat::keystone::auth::public_url: {get_param: [EndpointMap, HeatPublic, uri]}
+              heat::keystone::auth::internal_url: {get_param: [EndpointMap, HeatInternal, uri]}
+              heat::keystone::auth::admin_url: {get_param: [EndpointMap, HeatAdmin, uri]}
+              heat::keystone::auth::password: {get_param: HeatPassword}
+              heat::keystone::auth::region: {get_param: KeystoneRegion}