Remove EL7 support #970
Open
Remove EL7 support #970
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bastelfreak
reviewed
Jul 1, 2024
bastelfreak
reviewed
Jul 1, 2024
bastelfreak
reviewed
Jul 1, 2024
| @@ -21,7 +21,7 @@ | |||
| case $facts['os']['family'] { | |||
| 'RedHat': { | |||
| $majorrelease = $facts['os']['release']['major'] | |||
| if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') { | |||
| if versioncmp($zabbix_version, '7.0') >= 0 { | |||
There was a problem hiding this comment.
the whole block still doesn't correct to me. first we check on the zabbix version, then on the OS version and then an else block? Is that correct?
There was a problem hiding this comment.
If I understand the EL repo the logic was
zabbix < 7 on EL <= 8 require ZABBIX-A14FE591 and ZABBIX-79EA5ED4
zabbix < 7 on EL == 9 require ZABBIX-08EFA7DD
zabbix = 7 on EL >= 7 require ZABBIX-B5333005
So I first check if it is zabbix 7.0, then check if is EL9 else the old GPG
initialy it was
if versioncmp(fact('os.release.major'), '9') >= 0 {
$gpgkey_zabbix = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD'
$gpgkey_nonsupported = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD'
} else {
$gpgkey_zabbix = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591'
$gpgkey_nonsupported = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-79EA5ED4'
}
I've intruduced the if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') { but it had to be if versioncmp($zabbix_version, '7.0') >= 0 { from the beginning
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request (PR) description
This Pull Request (PR) fixes the following issues