Merge pull request #17 from bodepd/issue/master/dep_on_cond_resource

Fixed dep issue.
This commit is contained in:
Dan Bode 2011-06-24 11:03:12 -07:00
commit 29bdca5a76

View file

@ -20,7 +20,7 @@ class mysql::config(
unless => "mysqladmin -u root -p${root_password} status > /dev/null",
path => '/usr/local/sbin:/usr/bin',
require => [Package['mysql-server'], Service['mysqld']],
before => File['/root/.my.cnf', '/etc/my.cnf'],
before => File['/root/.my.cnf'],
notify => Exec['mysqld-restart'],
}
file{'/root/.my.cnf':
@ -29,6 +29,7 @@ class mysql::config(
if $etc_root_password {
file{'/etc/my.cnf':
content => template('mysql/my.cnf.pass.erb'),
require => Exec['set_mysql_rootpw'],
}
}
}