summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Shubin <purpleidea@redhat.com>2014-04-22 16:35:48 -0400
committerJames Shubin <purpleidea@redhat.com>2014-04-23 23:47:39 -0400
commit80c2b13448c97c70a4b4bc0e402e00ecb5d681d5 (patch)
tree570a4f4613e1cff2bd815d67b6435689a33f8502
parentb948c83c52c512bf1f1898c02bb4f03ce5a04148 (diff)
downloadpuppet-gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.gz
puppet-gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.xz
puppet-gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.zip
Add an extra mkfs blocker.
-rw-r--r--manifests/brick.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/brick.pp b/manifests/brick.pp
index c737c85..7fc3210 100644
--- a/manifests/brick.pp
+++ b/manifests/brick.pp
@@ -466,6 +466,7 @@ define gluster::brick(
onlyif => "/usr/bin/test -n '${valid_fsuuid}'",
unless => [ # if one element is true, this *doesn't* run
"/usr/bin/test -e /dev/disk/by-uuid/${valid_fsuuid}",
+ "/bin/findmnt --output 'TARGET,SOURCE' -t ${valid_fstype} --target '${valid_path}' -n",
'/bin/false', # TODO: add more criteria
],
require => $exec_requires,