diff options
-rw-r--r-- | data/tree/RedHat/Fedora.yaml | 1 | ||||
-rw-r--r-- | manifests/brick.pp | 2 | ||||
-rw-r--r-- | manifests/params.pp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/data/tree/RedHat/Fedora.yaml b/data/tree/RedHat/Fedora.yaml index ededc44..856eebe 100644 --- a/data/tree/RedHat/Fedora.yaml +++ b/data/tree/RedHat/Fedora.yaml @@ -14,6 +14,7 @@ gluster::params::program_vgdisplay: '/usr/sbin/vgdisplay' #gluster::params::program_lvdisplay: '/usr/sbin/lvdisplay' gluster::params::program_mkfs_xfs: '/usr/sbin/mkfs.xfs' gluster::params::program_mkfs_ext4: '/usr/sbin/mkfs.ext4' +gluster::params::program_findmnt: '/usr/bin/findmnt' gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd' # vim: ts=8 diff --git a/manifests/brick.pp b/manifests/brick.pp index 8e4aae9..9cd3c55 100644 --- a/manifests/brick.pp +++ b/manifests/brick.pp @@ -467,7 +467,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", + "${::gluster::params::program_findmnt} --output 'TARGET,SOURCE' -t ${valid_fstype} --target '${valid_path}' -n", '/bin/false', # TODO: add more criteria ], require => $exec_requires, diff --git a/manifests/params.pp b/manifests/params.pp index de3afd2..4fe4e8f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -49,6 +49,7 @@ class gluster::params( $program_mkfs_ext4 = '/sbin/mkfs.ext4', $program_fping = '/usr/sbin/fping', + $program_findmnt = '/bin/findmnt', # services... $service_glusterd = 'glusterd', |