From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 7 Dec 2016 14:16:41 +0000 (+0100)
Subject: Create Glance's database if glance-api is enabled
X-Git-Tag: opnfv-6.0.0~457
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a102d35f12e75bbf7fa9c5f91aeaef145f203143;p=apex-puppet-tripleo.git

Create Glance's database if glance-api is enabled

Instead of checking for glance_registry_enabled, we should be checking
for glance_api_enabled. The glance-api v1 depends on the registry, which
means the database will be created but glance-api v2 doesn't which means
that not deploying the registry would result in the glance database not
being created. On the other hand, glance-registry is never deployed
without glance-api

Change-Id: Ief25dafb65f7a043fbb3d16f1d7ef834c9947a93
---

diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index e5f366e..a039439 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -150,7 +150,7 @@ class tripleo::profile::base::database::mysql (
     if hiera('cinder_api_enabled', false) {
       include ::cinder::db::mysql
     }
-    if hiera('glance_registry_enabled', false) {
+    if hiera('glance_api_enabled', false) {
       include ::glance::db::mysql
     }
     if hiera('gnocchi_api_enabled', false) {