diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-26 13:33:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-26 13:33:23 +0000 |
| commit | ed9321998d5464fd2dae28802e8b965ef51d90d4 (patch) | |
| tree | f1893e9a4131244ef90fff24af50a0a885059f53 /manifests/profile/base/manila/scheduler.pp | |
| parent | 814560d54bbb45dc578bfdd1ea700264814702fb (diff) | |
| parent | 783929074bee6c14da23f6589dcbfbf4d9ff0800 (diff) | |
Merge "Move inclusion of ::manila::db::mysql in manila/api profile"
Diffstat (limited to 'manifests/profile/base/manila/scheduler.pp')
| -rw-r--r-- | manifests/profile/base/manila/scheduler.pp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp index 8581187..07ea676 100644 --- a/manifests/profile/base/manila/scheduler.pp +++ b/manifests/profile/base/manila/scheduler.pp @@ -18,34 +18,19 @@ # # === Parameters # -# [*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 # for more details. # Defaults to hiera('step') # class tripleo::profile::base::manila::scheduler ( - $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { - $sync_db = true - } else { - $sync_db = false - } - - if $step >= 3 and $sync_db { - include ::manila::db::mysql - } + include ::tripleo::profile::base::manila if $step >= 4 { include ::manila::compute::nova include ::manila::network::neutron include ::manila::scheduler } - } - |