From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 4 May 2016 13:16:54 +0000 (+0200)
Subject: Create dbs in step 3 for the roles
X-Git-Tag: opnfv-6.0.0~776
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=172412c0638107db538f1a491513de0836fdc311;p=apex-puppet-tripleo.git

Create dbs in step 3 for the roles

Before the roles we could make the create db operation depend on a
'galera-ready' resource [1]. We can't do it anymore from the role so
we need to do create in step 3, when we do sync as well.

1. https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/manifests/overcloud_controller_pacemaker.pp#L382

Change-Id: Id065a9180f1f1a41ab225ec5f755498ec7d9a827
---

diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp
index c114c53..b77b356 100644
--- a/manifests/profile/base/glance/registry.pp
+++ b/manifests/profile/base/glance/registry.pp
@@ -47,7 +47,7 @@ class tripleo::profile::base::glance::registry (
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
 ) {
 
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::glance::db::mysql
   }
 
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index f7674df..2f7a27a 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -62,7 +62,7 @@ class tripleo::profile::base::keystone (
   $step             = hiera('step'),
 ) {
 
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::keystone::db::mysql
   }