aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/manila/share.pp
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-09-22 18:15:45 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-09-23 16:14:16 +0200
commit783929074bee6c14da23f6589dcbfbf4d9ff0800 (patch)
tree813756843c3c7e6bfafdd8aa65ffa49e2190189e /manifests/profile/base/manila/share.pp
parentceccbfdd7b7a098741d79003f0741eee2a02df4d (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/share.pp')
-rw-r--r--manifests/profile/base/manila/share.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp
index ed64b29..d39c55c 100644
--- a/manifests/profile/base/manila/share.pp
+++ b/manifests/profile/base/manila/share.pp
@@ -26,8 +26,9 @@
class tripleo::profile::base::manila::share (
$step = hiera('step'),
) {
+ include ::tripleo::profile::base::manila
+
if $step >= 4 {
include ::manila::share
}
}
-