From 1d21ae5e20e4a624f73988b83843609fae975a1c Mon Sep 17 00:00:00 2001 From: Vincent Deygas Date: Tue, 20 Jan 2015 09:26:54 +0000 Subject: Managed awk path in gluster::param --- manifests/brick.pp | 2 +- manifests/params.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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', -- cgit