diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-01-18 09:01:14 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-01-22 10:30:42 -0500 |
| commit | 7c09ccf874d33dddae6597109102a11f14fcf92e (patch) | |
| tree | 87b37081854226e735e539e9358f80389a5baa4c | |
| parent | 3da37c8bc5f529a42b7b72f29fdb9a760c32f999 (diff) | |
puppet: allow config of ad-hoc Heat settings
Including ::heat::config on the controller roles will allow
ad-hoc (non-puppet managed) settings to be made in the
heat config file using Hiera.
Change-Id: I80a39b798869ac330ea8a4d01699f5db47c93d47
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index fad33ca1..503fbd74 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -563,6 +563,7 @@ if hiera('step') >= 3 { # Heat include ::heat + include ::heat::config include ::heat::api include ::heat::api_cfn include ::heat::api_cloudwatch diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 01a33f3f..d358a93b 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -978,6 +978,7 @@ if hiera('step') >= 3 { Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" } # Heat + include ::heat::config class { '::heat' : sync_db => $sync_db, } |