diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-09-22 18:15:45 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-09-23 16:14:16 +0200 |
| commit | 783929074bee6c14da23f6589dcbfbf4d9ff0800 (patch) | |
| tree | 813756843c3c7e6bfafdd8aa65ffa49e2190189e /manifests/profile/base/manila/scheduler.pp | |
| parent | ceccbfdd7b7a098741d79003f0741eee2a02df4d (diff) | |
Move inclusion of ::manila::db::mysql in manila/api profile
In puppet-manila it is the api service performing db sync, not
scheduler. This change moves ::manila::db::mysql (which creates
the empty database and users) in the tripleo manila/api profile.
Also moves rabbit config into a general manila base profile as
that would be needed by the scheduler service as well.
Change-Id: I2b537f735b8d1be8f39e8c274be3872b193c1014
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 } - } - |