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/pacemaker | |
| parent | 814560d54bbb45dc578bfdd1ea700264814702fb (diff) | |
| parent | 783929074bee6c14da23f6589dcbfbf4d9ff0800 (diff) | |
Merge "Move inclusion of ::manila::db::mysql in manila/api profile"
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 { |