Cleanup some small things.

2 files changed, 16 insertions, 5 deletions

diff --git a/manifests/volume/property.pp b/manifests/volume/property.pp
index a441fb8..5ddcf7b 100644
--- a/manifests/volume/property.pp
+++ b/manifests/volume/property.pp
@@ -22,6 +22,9 @@ define gluster::volume::property(
 	$autotype = true		# set to false to disable autotyping
 ) {
 	include gluster::volume::property::base
+	include gluster::vardir
+	#$vardir = $::gluster::vardir::module_vardir	# with trailing slash
+	$vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '')
 
 	$split = split($name, '#')	# do some $name parsing
 	$volume = $split[0]		# volume name
@@ -51,7 +54,7 @@ define gluster::volume::property(
 		$safe_value = shellquote($value)	# TODO: is this the safe thing?
 
 	# if it's not a string and it's not the expected type, fail
-	} elsif ( type($value) != $etype ) {	# type() is from puppet-common
+	} elsif ( type($value) != $etype ) {	# type() from puppetlabs-stdlib
 		fail("Gluster::Volume::Property[${key}] must be type: ${etype}.")
 
 	# convert to correct type
@@ -78,11 +81,11 @@ define gluster::volume::property(
 	# FIXME: check that the value we're setting isn't the default
 	# FIXME: you can check defaults with... gluster volume set help | ...
 	exec { "/usr/sbin/gluster volume set ${volume} ${key} ${safe_value}":
-		unless => "/usr/bin/test \"`/usr/sbin/gluster volume --xml info ${volume} | /var/lib/puppet/tmp/gluster/xml.py ${key}`\" = '${safe_value}'",
+		unless => "/usr/bin/test \"`/usr/sbin/gluster volume --xml info ${volume} | ${vardir}/xml.py ${key}`\" = '${safe_value}'",
 		logoutput => on_failure,
 		require => [
 			Gluster::Volume[$volume],
-			File['/var/lib/puppet/tmp/gluster/xml.py'],
+			File["${vardir}/xml.py"],
 		],
 	}
 }
diff --git a/manifests/volume/property/base.pp b/manifests/volume/property/base.pp
index 04c7ccc..4d5149d 100644
--- a/manifests/volume/property/base.pp
+++ b/manifests/volume/property/base.pp
@@ -16,18 +16,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class gluster::volume::property::base {
+	include gluster::vardir
+
 	package { 'python-lxml':		# for parsing gluster xml output
 		ensure => present,
 	}
 
-	file { '/var/lib/puppet/tmp/gluster/xml.py':
+	#$vardir = $::gluster::vardir::module_vardir	# with trailing slash
+	$vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '')
+
+	file { "${vardir}/xml.py":
 		source => 'puppet:///modules/gluster/xml.py',
 		owner => root,
 		group => nobody,
 		mode => 700,			# u=rwx
 		backup => false,		# don't backup to filebucket
 		ensure => present,
-		require => Package['python-lxml'],
+		require => [
+			Package['python-lxml'],
+			File["${vardir}/"],
+		],
 	}
 }