From 783929074bee6c14da23f6589dcbfbf4d9ff0800 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 22 Sep 2016 18:15:45 +0200
Subject: 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
---
 manifests/profile/base/manila/scheduler.pp | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'manifests/profile/base/manila/scheduler.pp')

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
   }
-
 }
-
-- 
cgit 1.2.3-korg