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/pacemaker | |
| 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/pacemaker')
| -rw-r--r-- | manifests/profile/pacemaker/manila.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index 45373f6..a1ff5ca 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -46,11 +46,11 @@ class tripleo::profile::pacemaker::manila ( stop => '/bin/true', } - if $step >= 4 { - include ::tripleo::profile::base::manila::api - include ::tripleo::profile::base::manila::scheduler - include ::tripleo::profile::base::manila::share + include ::tripleo::profile::base::manila::api + include ::tripleo::profile::base::manila::scheduler + include ::tripleo::profile::base::manila::share + if $step >= 4 { # manila generic: $manila_generic_enable = hiera('manila_generic_enable_backend', false) if $manila_generic_enable { |