diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-22 21:56:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-22 21:56:10 +0000 |
| commit | 56bc8272b3c07142ff1aa47685de9ec7ce2ffe89 (patch) | |
| tree | 332592c2d49c4e99c4269092b2f5386dca3e16bf | |
| parent | 4e0acc6e50041940a1f38d04d0036dd67bbbeaf3 (diff) | |
| parent | 7c09ccf874d33dddae6597109102a11f14fcf92e (diff) | |
Merge "puppet: allow config of ad-hoc Heat settings"
| -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, } |