From 2804934ecba7dfd52a222765174ad1c3018bab5f Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Fri, 7 Mar 2014 16:44:58 -0500
Subject: Add in a custom sponge utility to break the dependence on the EPEL
 repo.

---
 manifests/server.pp | 14 +++++++++++++-
 manifests/volume.pp |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/server.pp b/manifests/server.pp
index 6f4d5c9..e4e40e8 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -31,6 +31,11 @@ class gluster::server(
 ) {
 	$FW = '$FW'			# make using $FW in shorewall easier
 
+	include gluster::vardir
+
+	#$vardir = $::gluster::vardir::module_vardir	# with trailing slash
+	$vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '')
+
 	# if we use ::mount and ::server on the same machine, this could clash,
 	# so we use the ensure_resource function to allow identical duplicates!
 	$rname = "${version}" ? {
@@ -44,9 +49,16 @@ class gluster::server(
 		ensure_resource('gluster::repo', "${rname}", $params)
 	}
 
-	package { 'moreutils':		# for scripts needing: 'sponge'
+	# this is meant to be replace the excellent sponge utility by sponge.py
+	file { "${vardir}/sponge.py":		# for scripts needing: 'sponge'
+		source => 'puppet:///modules/gluster/sponge.py',
+		owner => root,
+		group => nobody,
+		mode => 700,			# u=rwx
+		backup => false,		# don't backup to filebucket
 		ensure => present,
 		before => Package['glusterfs-server'],
+		require => File["${vardir}/"],
 	}
 
 	package { 'glusterfs-server':
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 513a431..645c090 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -363,12 +363,12 @@ define gluster::volume(
 	$stack_truncate = "${maxlength}" ? {
 		'-1' => '',	# unlimited
 		#default => sprintf("&& /bin/sed -i '%d,$ d' ${stackfile}", inline_template('<%= @maxlength.to_i.abs+1 %>')),
-		default => sprintf(" && (/bin/grep -v '^$' ${stackfile} | /usr/bin/tail -n %d | /usr/bin/sponge ${stackfile})", inline_template('<%= @maxlength.to_i.abs %>')),
+		default => sprintf(" && (/bin/grep -v '^$' ${stackfile} | /usr/bin/tail -n %d | ${vardir}/sponge.py ${stackfile})", inline_template('<%= @maxlength.to_i.abs %>')),
 	}
 	$watch_truncate = "${maxlength}" ? {
 		'-1' => '',	# unlimited
 		#default => sprintf("&& /bin/sed -i '%d,$ d' ${watchfile}", inline_template('<%= @maxlength.to_i.abs+1 %>')),
-		default => sprintf(" && (/bin/grep -v '^$' ${watchfile} | /usr/bin/tail -n %d | /usr/bin/sponge ${watchfile})", inline_template('<%= @maxlength.to_i.abs %>')),
+		default => sprintf(" && (/bin/grep -v '^$' ${watchfile} | /usr/bin/tail -n %d | ${vardir}/sponge.py ${watchfile})", inline_template('<%= @maxlength.to_i.abs %>')),
 	}
 
 	if $are_bricks_collected and ("${valid_input}" != '') {	# ready or not?
-- 
cgit