diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-08-08 13:32:33 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-08-09 13:30:13 +0200 |
| commit | 355547c5e83d74b90187552b309154659e4a8139 (patch) | |
| tree | 06f20a2b77a6c6f08b53e4de5deb8c5a597e1a09 /manifests/profile/base/heat.pp | |
| parent | 689d80e97188342c84bb965980d48c8ed212e60d (diff) | |
Fix use of bootstrap_node in cinder base profile
By inspecting bootstrap_nodeid in cinder base profile we can
set sync_db appropriately and not always default to true.
Change-Id: I2484b1d70a17436c0d8eab9ea8df927d57783784
Diffstat (limited to 'manifests/profile/base/heat.pp')
| -rw-r--r-- | manifests/profile/base/heat.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 8512d6e..dcf0f21 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -18,8 +18,8 @@ # # === Parameters # -# [*bootstrap_master*] -# (Optional) The hostname of the node responsible for bootstrapping +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to downcase(hiera('bootstrap_nodeid')) # # [*manage_db_purge*] @@ -36,12 +36,12 @@ # Defaults to hiera('step') # class tripleo::profile::base::heat ( - $bootstrap_master = downcase(hiera('bootstrap_nodeid')), + $bootstrap_node = downcase(hiera('bootstrap_nodeid')), $manage_db_purge = hiera('heat_enable_db_purge', true), $notification_driver = 'messaging', $step = hiera('step'), ) { - # Domain resources will be created at step5 on the pacemaker_master so we + # Domain resources will be created at step5 on the bootstrap_node so we # configure heat.conf at step3 and 4 but actually create the domain later. if $step == 3 or $step == 4 { class { '::heat::keystone::domain': @@ -62,7 +62,7 @@ class tripleo::profile::base::heat ( if $manage_db_purge { include ::heat::cron::purge_deleted } - if $bootstrap_master == $::hostname { + if $bootstrap_node == $::hostname { # Class ::heat::keystone::domain has to run on bootstrap node # because it creates DB entities via API calls. include ::heat::keystone::domain |