diff options
Diffstat (limited to 'manifests/profile/base/heat.pp')
| -rw-r--r-- | manifests/profile/base/heat.pp | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 0fc30d8..dcf0f21 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -18,29 +18,38 @@ # # === Parameters # -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -# [*notification_driver*] -# (Optional) Heat notification driver to use. -# Defaults to 'messaging' -# -# [*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*] # (Optional) Whether keystone token flushing should be enabled # Defaults to hiera('keystone_enable_db_purge', true) # +# [*notification_driver*] +# (Optional) Heat notification driver to use. +# Defaults to 'messaging' +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# class tripleo::profile::base::heat ( - $step = hiera('step'), + $bootstrap_node = downcase(hiera('bootstrap_nodeid')), + $manage_db_purge = hiera('heat_enable_db_purge', true), $notification_driver = 'messaging', - $bootstrap_master = downcase(hiera('bootstrap_nodeid')), - $manage_db_purge = hiera('heat_enable_db_purge', true), + $step = hiera('step'), ) { + # 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': + manage_domain => false, + manage_user => false, + manage_role => false, + } + } if $step >= 4 { class { '::heat' : @@ -53,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 |