Merge pull request #215 from scornelissen85/master

ekohl · web-flow · commit 1a8c1cd45788 · 2020-10-19T11:57:47.000+02:00
Use $fact to retrieve fact
diff --git a/manifests/volume.pp b/manifests/volume.pp
@@ -157,12 +157,12 @@
           require => Exec["gluster create volume ${title}"],
         }
       }
-    } elsif $already_exists {
+    } elsif $already_exists and "gluster_volume_${title}_bricks" in $facts {
       # this volume exists
 
       if $ensure == 'present' {
         # our fact lists bricks comma-separated, but we need an array
-        $vol_bricks = split( getvar( "::gluster_volume_${title}_bricks" ), ',')
+        $vol_bricks = split( $facts["gluster_volume_${title}_bricks"], ',')
         if $bricks != $vol_bricks {
           # this resource's list of bricks does not match the existing
           # volume's list of bricks

Original file line number	Diff line number	Diff line change
`@@ -157,12 +157,12 @@`
`157`	`157`	`require => Exec["gluster create volume ${title}"],`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- } elsif $already_exists {`
	`160`	`+ } elsif $already_exists and "gluster_volume_${title}_bricks" in $facts {`
`161`	`161`	`# this volume exists`
`162`	`162`
`163`	`163`	`if $ensure == 'present' {`
`164`	`164`	`# our fact lists bricks comma-separated, but we need an array`
`165`		`- $vol_bricks = split( getvar( "::gluster_volume_${title}_bricks" ), ',')`
	`165`	`+ $vol_bricks = split( $facts["gluster_volume_${title}_bricks"], ',')`
`166`	`166`	`if $bricks != $vol_bricks {`
`167`	`167`	`# this resource's list of bricks does not match the existing`
`168`	`168`	`# volume's list of bricks`