Pull the repo base directly from the centralized params.pp file.

kiwnix · May 8, 2014 · 9280d58 · 9280d58
1 parent 2c0d467
commit 9280d58
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/data/tree/RedHat.yaml b/data/tree/RedHat.yaml
@@ -1,5 +1,5 @@
 # gluster/data/tree/RedHat.yaml
 ---
-gluster::repo::base: 'https://download.gluster.org/pub/gluster/glusterfs/'
+gluster::params::misc_gluster_repo: 'https://download.gluster.org/pub/gluster/glusterfs/'
 
 # vim: ts=8
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -56,6 +56,7 @@
 
 	# misc...
 	$misc_gluster_reload = '/sbin/service glusterd reload',
+	$misc_gluster_repo = 'https://download.gluster.org/pub/gluster/glusterfs/',
 
 	# comment...
 	$comment = ''

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -22,7 +22,9 @@
 	# if you leave this blank, we assume you want the latest version...
 	$version = ''
 ) {
-	$base = hiera('gluster::repo::base')	# eg: 'https://download.gluster.org/pub/gluster/glusterfs/'
+	include gluster::params
+
+	$base = "${::gluster::params::misc_gluster_repo}"
 
 	if "${version}" == '' {
 		# latest