fix

LukasAud · LukasAud · commit 0e9a4c62c2d9 · 2023-02-21T18:08:08.000Z
diff --git a/manifests/server/root_password.pp b/manifests/server/root_password.pp
@@ -46,7 +46,7 @@
     }
 
     # show_diff was added with puppet 3.0
-    if versioncmp($::puppetversion, '3.0') >= 0 {
+    if versioncmp($facts['puppetversion'], '3.0') >= 0 {
       File["${facts['root_home']}/.my.cnf"] { show_diff => false }
     }
     if $mysql::server::create_root_user {
@@ -55,7 +55,7 @@
   }
 
   if $mysql::server::create_root_login_file and $root_password_set {
-    file { "${::root_home}/.mylogin.cnf":
+    file { "${facts['root_home']}/.mylogin.cnf":
       source => $login_file,
       owner  => 'root',
       mode   => '0600',

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`# show_diff was added with puppet 3.0`
`49`		`- if versioncmp($::puppetversion, '3.0') >= 0 {`
	`49`	`+ if versioncmp($facts['puppetversion'], '3.0') >= 0 {`
`50`	`50`	`File["${facts['root_home']}/.my.cnf"] { show_diff => false }`
`51`	`51`	`}`
`52`	`52`	`if $mysql::server::create_root_user {`
`@@ -55,7 +55,7 @@`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if $mysql::server::create_root_login_file and $root_password_set {`
`58`		`- file { "${::root_home}/.mylogin.cnf":`
	`58`	`+ file { "${facts['root_home']}/.mylogin.cnf":`
`59`	`59`	`source => $login_file,`
`60`	`60`	`owner => 'root',`
`61`	`61`	`mode => '0600',`