Merge "Remove calls to ::mysql from the manifests"
This commit is contained in:
commit
c18950b41f
@ -113,8 +113,6 @@ if hiera('step') >= 2 {
|
|||||||
|
|
||||||
# FIXME: this should only occur on the bootstrap host (ditto for db syncs)
|
# FIXME: this should only occur on the bootstrap host (ditto for db syncs)
|
||||||
# Create all the database schemas
|
# Create all the database schemas
|
||||||
include ::keystone::db::mysql
|
|
||||||
include ::glance::db::mysql
|
|
||||||
include ::nova::db::mysql
|
include ::nova::db::mysql
|
||||||
include ::nova::db::mysql_api
|
include ::nova::db::mysql_api
|
||||||
include ::neutron::db::mysql
|
include ::neutron::db::mysql
|
||||||
|
@ -377,12 +377,6 @@ MYSQL_HOST=localhost\n",
|
|||||||
|
|
||||||
# Create all the database schemas
|
# Create all the database schemas
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
class { '::keystone::db::mysql':
|
|
||||||
require => Exec['galera-ready'],
|
|
||||||
}
|
|
||||||
class { '::glance::db::mysql':
|
|
||||||
require => Exec['galera-ready'],
|
|
||||||
}
|
|
||||||
class { '::nova::db::mysql':
|
class { '::nova::db::mysql':
|
||||||
require => Exec['galera-ready'],
|
require => Exec['galera-ready'],
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user