From a34dc5f94bb8aad8c95c27bab0b25053d2bb9726 Mon Sep 17 00:00:00 2001
From: Ross Williamson <rossw@infoxchange.net.au>
Date: Wed, 15 Jun 2016 12:54:07 +1000
Subject: [PATCH] Fix compatibility with strict variable checking and version
comparison on Puppet 4
---
manifests/init.pp | 4 +---
manifests/params.pp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 2f47c43..318d520 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,9 +13,7 @@ class freeradius (
$preserve_mods = true,
) inherits freeradius::params {
- if ($freeradius::fr_version != 3) {
- fail('This module is only compatible with FreeRADIUS 3')
- }
+ validate_re($freeradius::fr_version, '^3', 'This module is only compatible with FreeRADIUS 3')
if $control_socket == true {
warning('Use of the control_socket parameter in the freeradius class is deprecated. Please use the freeradius::control_socket class instead.')
diff --git a/manifests/params.pp b/manifests/params.pp
index 41f6f68..ffe0280 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -39,7 +39,7 @@ class freeradius::params {
}
# Use the FR version fact if defined, otherwise use our best estimate from above
- if $::freeradius_maj_version {
+ if getvar('::freeradius_maj_version') {
$fr_version = $::freeradius_maj_version
} else {
$fr_version = $fr_guessversion
--
GitLab