fixes #17504, #15619 - use generated puppet.conf when running Puppet #197
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
ares
reviewed
Dec 1, 2016
| 'hiera_config' => hiera.config_path, | ||
| 'noop' => !!noop?, | ||
| 'profile' => !!profile?, | ||
| 'show_diff' => false, |
There was a problem hiding this comment.
based on jenkins finding, trailing comma does not work in Ruby 1.8
ares
reviewed
Dec 1, 2016
| def write_config | ||
| @logger.debug("Writing Puppet config file at #{@temp_file.path}") | ||
| @temp_file.open | ||
| @temp_file.truncate(0) |
There was a problem hiding this comment.
just out of curiosity, is this because of race condition even when using Tempfile?
There was a problem hiding this comment.
It's in case the method is called twice so the file gets overwritten fully.
|
Except the 1.8 issue it looks good. |
domcleal
force-pushed
the
17504-puppet-conf
branch
from
c1eafe9
to
954f32f
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
PR updated with the trailing comma removed. Edit: and unpredictable ordering of the settings in puppet.conf under Ruby 1.8.7 fixed, now sorted by setting name. |
domcleal
force-pushed
the
17504-puppet-conf
branch
from
954f32f
to
af7aedc
Compare
|
Thanks @domcleal, merging. |
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.
No description provided.