summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 14:01:19 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 14:01:19 +0000
commit7ad8bab7ade264c470cbc675bb59c919693aa9cc (patch)
treef8413dcce13736d1eece14d04a13737a88a6c35a /manifests
parent7080223e1fea1acb539c5ce16c68819f12a19c70 (diff)
parenta675e69cf7a59654ecec5a0d55619d6044973c03 (diff)
Merge "Ensure the Heat Domain parameters before starting heat-engine pcmk service"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/heat.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 0fc30d8..fa0e2f1 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -42,6 +42,16 @@ class tripleo::profile::base::heat (
$manage_db_purge = hiera('heat_enable_db_purge', true),
) {
+ # Domain resources will be created at step5 on the pacemaker_master so we
+ # configure heat.conf at step3 and 4 but actually create the domain later.
+ if hiera('step') == 3 or hiera('step') == 4 {
+ class { '::heat::keystone::domain':
+ manage_domain => false,
+ manage_user => false,
+ manage_role => false,
+ }
+ }
+
if $step >= 4 {
class { '::heat' :
notification_driver => $notification_driver,