Skip to content

Commit df706ee

Browse files
committed
Use ensure_resource for mysql_databasein mysql::db
This will allow exported resource mysql::db to define same database but different hostname and enables the cluster web nodes to declear the mysql::db and to be collected on db node.
1 parent 2834498 commit df706ee

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

manifests/db.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
include '::mysql::client'
2020

21-
mysql_database { $dbname:
21+
$db_resource = {
2222
ensure => $ensure,
2323
charset => $charset,
2424
collate => $collate,
2525
provider => 'mysql',
2626
require => [ Class['mysql::server'], Class['mysql::client'] ],
27-
before => Mysql_user["${user}@${host}"],
2827
}
28+
ensure_resource('mysql_database', $dbname, $db_resource)
2929

3030
$user_resource = {
3131
ensure => $ensure,
@@ -41,7 +41,7 @@
4141
provider => 'mysql',
4242
user => "${user}@${host}",
4343
table => $table,
44-
require => [ Mysql_user["${user}@${host}"], Class['mysql::server'] ],
44+
require => [Mysql_database[$dbname], Mysql_user["${user}@${host}"], Class['mysql::server'] ],
4545
}
4646

4747
$refresh = ! $enforce_sql

0 commit comments

Comments
 (0)