diff options
-rw-r--r-- | manifests/brick.pp | 4 | ||||
-rw-r--r-- | manifests/volume.pp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/brick.pp b/manifests/brick.pp index f1c1433..1a28892 100644 --- a/manifests/brick.pp +++ b/manifests/brick.pp @@ -17,7 +17,7 @@ define gluster::brick( $dev, # /dev/sdc, /dev/disk/by-id/scsi-36003048007e14f0014ca2743150a5471 - $fsuuid, # set a uuid for this fs + $fsuuid, # set a uuid for this fs (uuidgen) $labeltype = '', # gpt $fstype = '', # xfs $xfs_inode64 = false, @@ -139,7 +139,7 @@ define gluster::brick( unless => [ # if one element is true, this *doesn't* run "/usr/bin/test -e `/bin/readlink -e ${dev}`1", # does partition 1 exist ? "/usr/bin/test -e /dev/disk/by-uuid/${fsuuid}", - "/bin/false", # TODO: add more criteria + '/bin/false', # TODO: add more criteria ], require => $exec_requires, timeout => 3600, # set to something very long diff --git a/manifests/volume.pp b/manifests/volume.pp index d7f6bd2..89f8f61 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -61,7 +61,7 @@ define gluster::volume( # add /${name} to the end of each: brick:/path entry $brick_spec = inline_template("<%= bricks.collect {|x| ''+x.chomp('/')+'/${name}' }.join(' ') %>") - # run if vip not defined (by pass mode) or vip exists on this machine + # run if vip not defined (bypass mode) or if vip exists on this machine if ($vip == '' or $vipif != '') { # NOTE: This should only happen on one host! # NOTE: There's maybe a theoretical race condition if this runs |