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

diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 0fc30d8..fa0e2f1 100644 (file)
--- 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,