From 784bc89273f636bdcd4bd5ff13cf3c04bd3d932a Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Mon, 24 Nov 2014 05:30:08 -0500
Subject: Clean up / make more consistent CentOS 7 fixes.

This does some small fixes to rbarlow's original commit (merged).
Originally, I wasn't sure it was the correct patch, and I implemented
something different to try it out a different way, but in the end, I
realized that rbarlow's method was better! rbarlow, you're on your way
to becoming a puppet superstar!

This patch just makes some small changes so that the code is consistent,
and nitpitcks a bit.
---
 data/tree/RedHat/CentOS/7.0.1406.yaml | 6 ++++--
 manifests/params.pp                   | 7 ++++---
 manifests/repo.pp                     | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/tree/RedHat/CentOS/7.0.1406.yaml b/data/tree/RedHat/CentOS/7.0.1406.yaml
index bec053d..711addd 100644
--- a/data/tree/RedHat/CentOS/7.0.1406.yaml
+++ b/data/tree/RedHat/CentOS/7.0.1406.yaml
@@ -1,5 +1,5 @@
+# gluster/data/tree/RedHat/CentOS/7.0.1406.yaml
 ---
-gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'
 gluster::params::package_python_argparse: ''	# doesn't exist
 gluster::params::program_modprobe: '/usr/sbin/modprobe'
 gluster::params::program_lsmod: '/usr/sbin/lsmod'
@@ -11,10 +11,12 @@ gluster::params::program_vgs: '/usr/sbin/vgs'
 gluster::params::program_lvs: '/usr/sbin/lvs'
 gluster::params::program_pvdisplay: '/usr/sbin/pvdisplay'
 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_mkfs_btrfs: '/usr/sbin/mkfs.btrfs'
 gluster::params::program_findmnt: '/usr/bin/findmnt'
-gluster::params::repo_operatingsystemrelease: '7'
+gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'
+gluster::params::misc_repo_operatingsystemrelease: '7'
 
 # vim: ts=8
diff --git a/manifests/params.pp b/manifests/params.pp
index de8baf0..ce8ef4d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -63,11 +63,12 @@ class gluster::params(
 	$misc_gluster_reload = '/sbin/service glusterd reload',
 	$misc_gluster_repo = 'https://download.gluster.org/pub/gluster/glusterfs/',
 
+	# the operatingsystemrelease string used in the repository URL.
+	$misc_repo_operatingsystemrelease = "${operatingsystemrelease}",
+
 	# comment...
-	$comment = '',
+	$comment = ''
 
-	# the operatingsystemrelease string used in the repository URL.
-	$repo_operatingsystemrelease = "${operatingsystemrelease}",
 ) {
 	if "${comment}" == '' {
 		warning('Unable to load yaml data/ directory!')
diff --git a/manifests/repo.pp b/manifests/repo.pp
index 2cf82d2..0fd0442 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -91,7 +91,7 @@ define gluster::repo(
 		fail("Architecture: '${architecture}' not yet supported.")
 	}
 
-	$base_arch = "${base_os}epel-${::gluster::params::repo_operatingsystemrelease}/"
+	$base_arch = "${base_os}epel-${::gluster::params::misc_repo_operatingsystemrelease}/"
 
 	$gpgkey = "${base_os}pub.key"
 
-- 
cgit