Fixes #27552 - Fix journald logging #531
Merged
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
ekohl
force-pushed
the
fix-journald
branch
2 times, most recently
from
b8dfe73 to
c2c1edf
Compare
ekohl
commented
Aug 8, 2019
fde8d9b attempted to implement installing foreman-proxy-journald when the logging was set to JOURNAL. The check was comparing JOURNAL to JOURNALD. This patch corrects it and adds both unit and acceptance tests.
|
💚 now |
evgeni
reviewed
Aug 9, 2019
| package { 'foreman-proxy-journald': | ||
| ensure => installed, | ||
| } | ||
| if $foreman_proxy::repo { | ||
| Foreman::Repos['foreman_proxy'] -> Package['foreman-proxy-journald'] | ||
| } |
There was a problem hiding this comment.
This could also be
Foreman::Repos<| title == 'foreman_proxy' |> -> Package['foreman-proxy-journald']and thus avoid the if. It could also be Foreman::Repos <| |> -> …
Whether this is more readable or not, I don't know :)
There was a problem hiding this comment.
I also considered introducing a tag to collect on (https://github.com/theforeman/puppet-foreman/blob/a14059fdcb7701336396a570def254588e7f955e/manifests/compute/ovirt.pp#L12) but since this may need a cherry pick I decided to keep this PR simple.
evgeni
approved these changes
Aug 9, 2019
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.
fde8d9b attempted to implement installing foreman-proxy-journald when the logging was set to JOURNAL. The check was comparing JOURNAL to JOURNALD.
This patch corrects it and adds both unit and acceptance tests.