From 7e0534d546756cba0a91d7751f5048b94bc5e0d8 Mon Sep 17 00:00:00 2001
From: Michael Chapman <woppin@gmail.com>
Date: Wed, 20 Apr 2016 01:10:13 +1000
Subject: Add steps to database profiles

Database schema profiles were missing step information, causing
schemas to be created too early.

Change-Id: Ic381804ce5f1aa257ece75d2e079f4b02f446344
---
 manifests/profile/pacemaker/database/schemas.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'manifests/profile/pacemaker/database')

diff --git a/manifests/profile/pacemaker/database/schemas.pp b/manifests/profile/pacemaker/database/schemas.pp
index 6aa5906..b301bab 100644
--- a/manifests/profile/pacemaker/database/schemas.pp
+++ b/manifests/profile/pacemaker/database/schemas.pp
@@ -18,6 +18,10 @@
 #
 # === Parameters
 #
+# [*step*]
+#   (Optional) The current deployment step
+#   Defaults to hiera('step')
+#
 # [*ceilometer_backend*]
 #   (Optional) The backend used by ceilometer, usually either 'mysql'
 #   or 'mongodb'
@@ -28,10 +32,11 @@
 #   Defaults to hiera('bootstrap_nodeid')
 #
 class tripleo::profile::pacemaker::database::schemas (
+  $step               = hiera('step'),
   $ceilometer_backend = hiera('ceilometer_backend'),
   $pacemaker_master   = hiera('bootstrap_nodeid')
 ) {
-  if downcase($pacemaker_master) == $::hostname {
+  if downcase($pacemaker_master) == $::hostname and $step >= 2 {
     include ::tripleo::profile::base::database::schemas
 
     if downcase($ceilometer_backend) == 'mysql' {
-- 
cgit 1.2.3-korg