diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-10 18:07:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-10 18:07:58 +0000 |
| commit | 1e11964372ee2d719c2f951c1f3820f35f3e225a (patch) | |
| tree | e4a5c8ee739593b371da799796b6f2d4316708f8 /puppet/services/heat-base.yaml | |
| parent | 977106ff5ee82f341f13b210cfe25ad31c87a7dc (diff) | |
| parent | ed95fda7eda85e3d6e23b6e23be763ad2ddf282c (diff) | |
Merge "Ensure heat-domain hiera is in nodes that contain keystone"
Diffstat (limited to 'puppet/services/heat-base.yaml')
| -rw-r--r-- | puppet/services/heat-base.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
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' |