From d61ae97bea12d2aaf8b952927789eb0682d1f173 Mon Sep 17 00:00:00 2001
From: Randy Barlow <rbarlow@redhat.com>
Date: Wed, 12 Nov 2014 21:01:37 -0500
Subject: Add support for CentOS 7.0.

---
 data/tree/RedHat/CentOS/7.0.1406.yaml | 20 ++++++++++++++++++++
 manifests/params.pp                   |  5 ++++-
 manifests/repo.pp                     |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 data/tree/RedHat/CentOS/7.0.1406.yaml

diff --git a/data/tree/RedHat/CentOS/7.0.1406.yaml b/data/tree/RedHat/CentOS/7.0.1406.yaml
new file mode 100644
index 0000000..bec053d
--- /dev/null
+++ b/data/tree/RedHat/CentOS/7.0.1406.yaml
@@ -0,0 +1,20 @@
+---
+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'
+gluster::params::program_parted: '/usr/sbin/parted'
+gluster::params::program_pvcreate: '/usr/sbin/pvcreate'
+gluster::params::program_vgcreate: '/usr/sbin/vgcreate'
+gluster::params::program_lvcreate: '/usr/sbin/lvcreate'
+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_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'
+
+# vim: ts=8
diff --git a/manifests/params.pp b/manifests/params.pp
index 8ed265e..de8baf0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -64,7 +64,10 @@ class gluster::params(
 	$misc_gluster_repo = 'https://download.gluster.org/pub/gluster/glusterfs/',
 
 	# 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 57b8db6..2cf82d2 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-${operatingsystemrelease}/"
+	$base_arch = "${base_os}epel-${::gluster::params::repo_operatingsystemrelease}/"
 
 	$gpgkey = "${base_os}pub.key"
 
@@ -103,7 +103,7 @@ define gluster::repo(
 		enabled => true,
 		gpgcheck => true,
 		# XXX: this should not be an https:// link, it should be a file
-		gpgkeys => ["${gpgkey}"],
+		gpgkeys => "${gpgkey}",
 		ensure => present,
 	}
 
-- 
cgit