Merge pull request #656 from puppetlabs/revert-651-bug/master/root_account_fix

hunner · hunner · commit 9192a9d0ad83 · 2015-02-03T13:53:08.000-08:00
Revert "(#MODULES-1058) root_password.pp cannot create /root/.my.cnf due...
diff --git a/manifests/server/root_password.pp b/manifests/server/root_password.pp
@@ -14,6 +14,7 @@
       content => template('mysql/my.cnf.pass.erb'),
       owner   => 'root',
       mode    => '0600',
+      require => Mysql_user['root@localhost'],
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`content => template('mysql/my.cnf.pass.erb'),`
`15`	`15`	`owner => 'root',`
`16`	`16`	`mode => '0600',`
	`17`	`+ require => Mysql_user['root@localhost'],`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`