summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 22:50:30 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 22:50:30 +0000
commit30ebec7461cdbbf16e63c81df0aa17b96af69815 (patch)
tree295c3f57f6c2248e51db0000283c748987f739ab /puppet/services
parent86f958491e514cc5bfd903742d00a5a81fa4513f (diff)
parent4e98b29572c9cfad837c6a367e4a187bd2cb7d5f (diff)
Merge "Pass heat domain admin password to keystone"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/heat-engine.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 24c36362..20415eef 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -103,3 +103,6 @@ outputs:
heat::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
+ keystone:
+ # This is needed because the keystone profile handles creating the domain
+ heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}