openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Ensure the Heat Domain parameters before starting heat-engine pcmk service"

Browse Source
This commit is contained in:
Jenkins
2016-07-21 14:01:19 +00:00
committed by Gerrit Code Review
parent 7080223e1f a675e69cf7
commit 7ad8bab7ad
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/profile/base/heat.pp
View File

@@ -42,6 +42,16 @@ class tripleo::profile::base::heat (
$manage_db_purge = hiera('heat_enable_db_purge', true), $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 { if $step >= 4 {
class { '::heat' : class { '::heat' :
notification_driver => $notification_driver, notification_driver => $notification_driver,