Include ::heat at step 3

Since we include ::heat::keystone::domain at step 3, and that class
requires heat.conf since it uses the heat_config resource, we need to
also include ::heat at step 3. The ::heat class will take care of
installing openstack-heat-common that provides heat.conf.

Closes-Bug: #165389
Partially-implements: blueprint split-stack-software-configuration
Change-Id: I5ba34ca96ca84d3f1cf3785ed8bbef6720f7bd42

diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index c743ce0..6e7e5f6 100644 (file)
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -59,9 +59,7 @@ class tripleo::profile::base::heat (
       manage_user   => false,
       manage_role   => false,
     }
-  }
 
-  if $step >= 4 {
     $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::heat' :
       notification_driver => $notification_driver,