summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 13:22:43 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 13:22:43 +0000
commitd6eec7809a57e21faea1737a0339e1f84b96b28a (patch)
treee2633c8daa447b659caaeb622221d9206a10c5c5 /puppet/manifests
parenta7e30686903d0fa9430435c527b9fd4de1d0bb19 (diff)
parentcca02126a1f464c70182804d8bbfd1a20b829630 (diff)
Merge "Remove nova::db classes, moved to puppet-tripleo"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp2
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp7
2 files changed, 0 insertions, 9 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 29c8d1b1..4779d517 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 ff065695..c7f64f1d 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'],