Remove dnssec-enable option for EL >= 9 #218
Conversation
manifests/params.pp
Outdated
| $dnssec_enable = $facts['os']['Family'] ? { | ||
| 'RedHat' => if versioncmp($facts['os']['release']['major'], '8') >= 0 { undef } else { 'yes' }, | ||
| default => undef, | ||
| } |
There was a problem hiding this comment.
You're already in the RedHat os family branch.
| $dnssec_enable = $facts['os']['Family'] ? { | |
| 'RedHat' => if versioncmp($facts['os']['release']['major'], '8') >= 0 { undef } else { 'yes' }, | |
| default => undef, | |
| } | |
| $dnssec_enable = if versioncmp($facts['os']['release']['major'], '8') >= 0 { undef } else { 'yes' } |
However, I do think that on EL8 it's still relevant. That has 9.11 and only 9.15 made it obsolete. So should it be this?
| $dnssec_enable = $facts['os']['Family'] ? { | |
| 'RedHat' => if versioncmp($facts['os']['release']['major'], '8') >= 0 { undef } else { 'yes' }, | |
| default => undef, | |
| } | |
| $dnssec_enable = if versioncmp($facts['os']['release']['major'], '9') >= 0 { undef } else { 'yes' } |
There was a problem hiding this comment.
I'd not fully realised that higher up I'd joined the RedHat branch, this was a great spot and helpful, thank you
|
excellent feedback, happy to make the changes, I got the warning on my CentOS 8 bind host though, so I will go back and double check the version on that. |
manifests/params.pp
Outdated
| @@ -54,7 +54,8 @@ | |||
| # This option is not relevant for RedHat | |||
| $sysconfig_resolvconf_integration = undef | |||
|
|
|||
| $dnssec_enable = 'yes' | |||
| $dnssec_enable = if versioncmp($facts['os']['release']['major'], '9') >= 0 { undef } else { 'yes' } | |||
| } | |||
|
do I need to look at the rspec test suites on this as while the module works fine on EL9 (which is where the test suite is failing) I'm not sure if these tests are known to fail, or if I should dig into them and look to update them. |
|
Yes, the failures are caused by your change. |
|
thank you, I'll look at the tests now. |
|
tests updated, thanks for the help |
ekohl
changed the title
validated against EL (Redhat / CentOS / Rocky) 7 - 8 - 9 functions correctly.
Basic test against Fedora 35, which also works
Adds check of EL version greater than 7 and sets dnssec_enable parameter to undef if greater to allow the removal of the parameter from options.conf, which is a deprecated parameter in EL8 and later. This removes any warning in 9.15 and any breakage in 9.18 or later. Any version EL 7 or earlier includes the parameter allowing the user to set it on and off depending on if they want to use it, but the parameter is included as a valid parameter