summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Deygas <Vincent.Deygas@rewardgateway.com>2015-01-20 09:26:54 +0000
committerJames Shubin <james@shubin.ca>2015-01-20 05:41:12 -0500
commit1d21ae5e20e4a624f73988b83843609fae975a1c (patch)
tree86fd9f87079903c53587a394eecd563ae2581fd4
parent96304dcd6a7655e7f7fc63b9dfe98a24fced4ae7 (diff)
downloadpuppet-gluster-1d21ae5e20e4a624f73988b83843609fae975a1c.tar.gz
puppet-gluster-1d21ae5e20e4a624f73988b83843609fae975a1c.tar.xz
puppet-gluster-1d21ae5e20e4a624f73988b83843609fae975a1c.zip
Managed awk path in gluster::param
-rw-r--r--manifests/brick.pp2
-rw-r--r--manifests/params.pp1
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/brick.pp b/manifests/brick.pp
index 4724eb7..c161dc6 100644
--- a/manifests/brick.pp
+++ b/manifests/brick.pp
@@ -446,7 +446,7 @@ define gluster::brick(
logoutput => on_failure,
unless => [ # if one element is true, this *doesn't* run
#"${::gluster::params::program_lvdisplay} ${lvm_lvname}", # nope!
- "${::gluster::params::program_lvs} --separator ':' | /usr/bin/tr -d ' ' | /bin/awk -F ':' '{print \$1}' | /bin/grep -q '${lvm_lvname}'",
+ "${::gluster::params::program_lvs} --separator ':' | /usr/bin/tr -d ' ' | ${::gluster::params::program_awk} -F ':' '{print \$1}' | /bin/grep -q '${lvm_lvname}'",
'/bin/false', # TODO: add more criteria
],
require => $exec_requires,
diff --git a/manifests/params.pp b/manifests/params.pp
index 7b3f6bd..d1113da 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -52,6 +52,7 @@ class gluster::params(
$program_fping = '/usr/sbin/fping',
$program_findmnt = '/bin/findmnt',
+ $program_awk = '/bin/awk',
# SELinux
$selinux_glusterd_seluser = 'system_u',