summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-01-13 15:41:59 -0500
committerJames Slagle <jslagle@redhat.com>2017-01-13 15:44:20 -0500
commita9cd9e6838f16d7368ecff0c2d3ff71dcb0e2deb (patch)
tree707667f85e73a290450308aa0a3ec913cd68dc46 /manifests
parent5acb133b7f1ec727d544362a4901f7abd05550a9 (diff)
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
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/heat.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index c743ce0..6e7e5f6 100644
--- 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,