(PUP-11201) Refine when the last used environment is used #8733
Conversation
This file contains hidden or 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
GabrielNagy
force-pushed
the
PUP-11201/refine-last-used-env
branch
5 times, most recently
from
1c0c231 to
8392cb6
Compare
With the recent changes in PUP-10216, the agent stores the last used environment in `last_run_summary.yaml`. If the next run does not specify an environment on the CLI, then the last used environment always takes precedence over the environment specified in puppet.conf. This change makes an exception for the agent-specified case so that the second run only uses the environment from the previous run if it was server-specified. Otherwise, the agent should start in its configured environment (from puppet.conf) or default to "production".
|
jenkins please test this with servertests |
GabrielNagy
commented
Aug 9, 2021
| if last_agent_environment | ||
| @environment = last_agent_environment | ||
| report.environment = last_agent_environment | ||
| unless (cached_catalog || options[:catalog] || Puppet.settings.set_by_cli?(:environment) || Puppet[:strict_environment_mode]) |
There was a problem hiding this comment.
If Puppet[:strict_environment_mode] is set, or if environment is set via CLI, there is no point in checking the lastrunfile; we just assume it's authoritative and fail further down if needed.
BobosilaVictor
approved these changes
Aug 10, 2021
ciprianbadescu
approved these changes
Aug 10, 2021
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.
With the recent changes in PUP-10216, the agent stores the last used environment in
last_run_summary.yaml. If the next run does not specify an environment on the CLI, then the last used environment always takes precedence over the environment specified in puppet.conf.This change makes an exception for the agent-specified case so that the second run only uses the environment from the previous run if it was server-specified. Otherwise, the agent should start in its configured environment (from puppet.conf) or default to "production".