Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use system packages on EL8 #734

Merged
merged 1 commit into from
Jun 4, 2019
Merged

Use system packages on EL8 #734

merged 1 commit into from
Jun 4, 2019

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented May 20, 2019

This is untested, but here so it can be tested.

cc @ehelms

$hammer_plugin_prefix = 'tfm-rubygem-hammer_cli_'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you say "except on EL7", maybe we should check for EL7?

Suggested change
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
if $facts['operatingsystemmajrelease'] == '7' {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(and obviously flip that if/else around)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I preferred this version because it's a smaller diff if you ignore whitespace, but did think about your suggestion before. I was also worried about strings vs integers in an exact comparison.

Copy link
Member

@ehelms ehelms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

General +1 for me, it worked, tests need some love. I think foreman_proxy and katello modules will need this same concept applied.

@ekohl ekohl merged commit 44ca689 into theforeman:master Jun 4, 2019
@ekohl ekohl deleted the el8 branch June 4, 2019 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants