aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2016-07-14 11:12:06 +0300
committerGael Chamoulaud <gchamoul@redhat.com>2016-07-20 16:23:59 +0200
commita675e69cf7a59654ecec5a0d55619d6044973c03 (patch)
treee74bce3af242ab5cafe46a71fdf1d52a4988d0ea
parentdfa0db9c7f5ece0914be616f963bf871563e6a1c (diff)
Ensure the Heat Domain parameters before starting heat-engine pcmk service
Heat needs stack_user_domain_id or stack_user_domain_name config options set in the heat.conf before starting. The domain itself doesn't need to exist until a stack is actually created, but the value needs to be there. This patch ensures that the heat domain parameters are configured before starting the heat-engine service with Pacemaker at step3 and 4, and at step5, Pacemaker will start the services and Puppet will create the domains. (note: commit message copied from https://review.openstack.org/#/c/331652/ to mitaka tht, which came first) Change-Id: I58fa53357265c1607d2df1b04cc2296083212ab7 Closes-Bug: 1599232
-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,