diff options
| author | James Shubin <james@shubin.ca> | 2014-11-24 05:30:08 -0500 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2014-11-24 05:30:08 -0500 |
| commit | 784bc89273f636bdcd4bd5ff13cf3c04bd3d932a (patch) | |
| tree | 5666c5024a98027dbf9ae94d95fadce63efc0586 /manifests | |
| parent | d61ae97bea12d2aaf8b952927789eb0682d1f173 (diff) | |
| download | puppet-gluster-784bc89273f636bdcd4bd5ff13cf3c04bd3d932a.tar.gz puppet-gluster-784bc89273f636bdcd4bd5ff13cf3c04bd3d932a.tar.xz puppet-gluster-784bc89273f636bdcd4bd5ff13cf3c04bd3d932a.zip | |
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.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/params.pp | 7 | ||||
| -rw-r--r-- | manifests/repo.pp | 2 |
2 files changed, 5 insertions, 4 deletions
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" |