From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 2 Nov 2016 10:06:05 +0000 (+0200)
Subject: Ensure heat-domain hiera is in nodes that contain keystone
X-Git-Tag: opnfv-6.0.0~1418^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ed95fda7eda85e3d6e23b6e23be763ad2ddf282c;p=apex-tripleo-heat-templates.git

Ensure heat-domain hiera is in nodes that contain keystone

The commit that this depends on only works if heat is deployed in the
same node as keystone. Once we deploy them in different nodes, keystone
won't be able to retrieve the appropriate hieradata. This fixes that by
setting the appropriate hieradata to be deployed on the keystone service
by the heat profiles.

Change-Id: I1f08db68a14486526879d1a5a1ff78cb17686924
Depends-On: I7d42d04ef0c53dc1e62d684d8edacfed9fd28fbe
---

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 1a86ec71..12d4a6a1 100644
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -76,9 +76,11 @@ outputs:
         include ::tripleo::profile::base::heat::api_cfn
       service_config_settings:
         keystone:
-          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]}
-          heat::keystone::auth_cfn::password: {get_param: HeatPassword}
-          heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
+          map_merge:
+            - get_attr: [HeatBase, role_data, service_config_settings, keystone]
+            - 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]}
+              heat::keystone::auth_cfn::password: {get_param: HeatPassword}
+              heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index 2ea96fc0..b0cd16dd 100644
--- 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}
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml
index 7eb58f56..a2a65d7d 100644
--- a/puppet/services/heat-base.yaml
+++ b/puppet/services/heat-base.yaml
@@ -77,3 +77,8 @@ outputs:
         heat::cron::purge_deleted::destination: '/dev/null'
         heat::db::database_db_max_retries: -1
         heat::db::database_max_retries: -1
+      service_config_settings:
+        keystone:
+          tripleo::profile::base::keystone::heat_admin_domain: 'heat_stack'
+          tripleo::profile::base::keystone::heat_admin_user: 'heat_stack_domain_admin'
+          tripleo::profile::base::keystone::heat_admin_email: 'heat_stack_domain_admin@localhost'