diff options
Diffstat (limited to 'manifests/profile/base/sahara')
| -rw-r--r-- | manifests/profile/base/sahara/api.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/sahara/engine.pp | 21 |
2 files changed, 18 insertions, 10 deletions
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp index e9149b1..1ead106 100644 --- a/manifests/profile/base/sahara/api.pp +++ b/manifests/profile/base/sahara/api.pp @@ -24,10 +24,11 @@ # Defaults to hiera('step') # class tripleo::profile::base::sahara::api ( - $step = hiera('step'), + $step = hiera('step'), ) { + include ::tripleo::profile::base::sahara + if $step >= 4 { - include ::tripleo::profile::base::sahara - include ::sahara::api + include ::sahara::service::api } } diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp index 28aff7b..4dbaa85 100644 --- a/manifests/profile/base/sahara/engine.pp +++ b/manifests/profile/base/sahara/engine.pp @@ -18,9 +18,9 @@ # # === Parameters # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to true +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') # # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates @@ -28,15 +28,22 @@ # Defaults to hiera('step') # class tripleo::profile::base::sahara::engine ( - $sync_db = true, - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::sahara + if $step >= 3 and $sync_db { include ::sahara::db::mysql } if $step >= 4 or ($step >= 3 and $sync_db) { - include ::tripleo::profile::base::sahara - include ::sahara::engine + include ::sahara::service::engine } } |