Configure project name for keystone::auth resource in heat

Heat API and CFN API both need to have teh keystone::auth*::tenant
parameters configured.

Change-Id: Ibdc3d693f5a63362add3fc71064fc01bb4593403

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index f8832dd..c3a3b7a 100644 (file)
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -35,6 +35,7 @@ outputs:
         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]}

diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index c0e7a69..b4402a1 100644 (file)
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@@ -35,6 +35,7 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - heat::api::workers: {get_param: HeatWorkers}
+            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]}

diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml
index 01f2a51..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'