From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 6 Jun 2016 16:27:06 +0000 (-0400)
Subject: Remove nova::db classes, moved to puppet-tripleo
X-Git-Tag: opnfv-6.0.0~1931^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cca02126a1f464c70182804d8bbfd1a20b829630;p=apex-tripleo-heat-templates.git

Remove nova::db classes, moved to puppet-tripleo

Implements: blueprint refactor-puppet-manifests

Depends-On: I4fc3cb822822adc1c58b2cfa2de8584a73fa6427
Change-Id: I61be5ccffb8c84eba5df13930fe3c742e9f0eec6
---

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 6084c954..8cac775a 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -77,8 +77,6 @@ if hiera('step') >= 2 {
 
   # FIXME: this should only occur on the bootstrap host (ditto for db syncs)
   # Create all the database schemas
-  include ::nova::db::mysql
-  include ::nova::db::mysql_api
   if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
     include ::gnocchi::db::mysql
   }
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 13271116..86cd775c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -251,13 +251,6 @@ if hiera('step') >= 2 {
 
   # Create all the database schemas
   if $sync_db {
-    class { '::nova::db::mysql':
-      require => Exec['galera-ready'],
-    }
-    class { '::nova::db::mysql_api':
-      require => Exec['galera-ready'],
-    }
-
     if downcase(hiera('ceilometer_backend')) == 'mysql' {
       class { '::ceilometer::db::mysql':
         require => Exec['galera-ready'],