diff options
author | 2016-08-10 07:09:59 +0000 | |
---|---|---|
committer | 2016-08-10 07:09:59 +0000 | |
commit | b2c80337669164699b58e37e4813a9d9b7dc60a5 (patch) | |
tree | 98d918a290e250b58ea25a4beb2ff4ef054b0f5b /manifests/profile/base/cinder.pp | |
parent | 855d4b5e5e2521ac8a7dda32c0ce9d43f002b5c9 (diff) | |
parent | 355547c5e83d74b90187552b309154659e4a8139 (diff) |
Merge "Fix use of bootstrap_node in cinder base profile"
Diffstat (limited to 'manifests/profile/base/cinder.pp')
-rw-r--r-- | manifests/profile/base/cinder.pp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 8f252d4..43d95b4 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -18,26 +18,30 @@ # # === Parameters # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# # [*cinder_enable_db_purge*] # (Optional) Wheter to enable db purging # Defaults to true # -# [*pacemaker_master*] -# (Optional) The master node runs some tasks -# one step earlier than others; disable to -# the node is not the master. -# Defaults to true -# # [*step*] # (Optional) The current step of the deployment # Defaults to hiera('step') # class tripleo::profile::base::cinder ( + $bootstrap_node = hiera('bootstrap_nodeid', undef), $cinder_enable_db_purge = true, - $pacemaker_master = true, $step = hiera('step'), ) { - if $step >= 4 or ($step >= 3 and $pacemaker_master) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + if $step >= 4 or ($step >= 3 and $sync_db) { include ::cinder include ::cinder::config } |