diff options
author | James Shubin <james@shubin.ca> | 2014-05-08 15:30:30 -0400 |
---|---|---|
committer | James Shubin <james@shubin.ca> | 2014-05-08 15:30:30 -0400 |
commit | 9280d58bc043f169f1feeb5074c8fa8d0507fe07 (patch) | |
tree | 719ffc3ca68bad9efc77001245dc2dff00bf5099 | |
parent | 2c0d467f09109a2beb09bc6a4c33103390351f15 (diff) | |
download | puppet-gluster-9280d58bc043f169f1feeb5074c8fa8d0507fe07.tar.gz puppet-gluster-9280d58bc043f169f1feeb5074c8fa8d0507fe07.tar.xz puppet-gluster-9280d58bc043f169f1feeb5074c8fa8d0507fe07.zip |
Pull the repo base directly from the centralized params.pp file.
-rw-r--r-- | data/tree/RedHat.yaml | 2 | ||||
-rw-r--r-- | manifests/params.pp | 1 | ||||
-rw-r--r-- | manifests/repo.pp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/data/tree/RedHat.yaml b/data/tree/RedHat.yaml index 417b83b..f320de4 100644 --- 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 index 9eeda09..a6535f8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -56,6 +56,7 @@ class gluster::params( # 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 index 747493c..57b8db6 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -22,7 +22,9 @@ define gluster::repo( # 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 |