Fixes #31022 - Use an isolated Puppet environment #585
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
When there's splay=true in /etc/puppetlabs/puppet/puppet.conf, puppet apply waits a random period (up to 30 minutes). Kafo deals with this by using --config=/tmp/.../puppet.conf which is generated in the ExecutionEnvironment. The boot hook apply_puppet_code does not use this which causes the host's puppet.conf to take effect. This can lead to much longer installer times where it just sleeps. This patch uses the new puppet_execution_environment hook method to get a clean enviroment. It also respects noop from the app_value which it previously didn't.
ehelms
reviewed
Oct 7, 2020
| def apply_puppet_code(code) | ||
| bin_path = Kafo::PuppetCommand.search_puppet_path('puppet') | ||
| Open3.capture3(*Kafo::PuppetCommand.format_command("echo \"#{code}\" | #{bin_path} apply --detailed-exitcodes")) | ||
| def apply_puppet_code(code, use_noop=true) |
There was a problem hiding this comment.
Feels like this whole thing would live in Kafo to be honest.
There was a problem hiding this comment.
Kind of, but I wasn't sure how things would behave if you have multiple definitions of that. I'd still be open to it.
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.
When there's splay=true in /etc/puppetlabs/puppet/puppet.conf, puppet apply waits a random period (up to 30 minutes). Kafo deals with this by using --config=/tmp/.../puppet.conf which is generated in the ExecutionEnvironment. The boot hook apply_puppet_code does not use this which causes the host's puppet.conf to take effect. This can lead to much longer installer times where it just sleeps.
This patch uses the new puppet_execution_environment hook method to get a clean enviroment. It also respects noop from the app_value which it previously didn't.
Alternative to #584 but requires theforeman/kafo#284.