(#7316) Do not set default values for confdir and vardir in the master#1189
Closed
jeffmccune wants to merge 3 commits intopuppetlabs:3.xfrom
Closed
(#7316) Do not set default values for confdir and vardir in the master#1189jeffmccune wants to merge 3 commits intopuppetlabs:3.xfrom
jeffmccune wants to merge 3 commits intopuppetlabs:3.xfrom
Conversation
added 3 commits
September 26, 2012 11:48
…_try3' into 3.x"" This reverts commit ef3fe69.
…pp_defaults Without this patch we don't have any spec test coverage for the app_defaults instance method of the Puppet::Application::Master class. This lack of coverage is problem because cherry picking the confdir and vardir patch from PR-882 in commit b064ee6 appears to work just fine after resolving the merge conflicts. Things were not fine, however, because the app_defaults method makes a call that raises an exception and none of our spec tests caught this issue. The acceptance tests did, however, by exercising the command `puppet master --configprint pidfile`
… the master Without this patch applied `puppet master` will explicitly set the value for confdir and vardir inside of Puppet::Application::Master#app_defaults. This is a problem because it calls a method that does not exist while trying to do so. This patch fixes the problem by implementing the intended behavior documented in #15337, and specifically in commit 38cba0a. This intended behavior is: 1: If provided, use explicit puppet.conf in `--confdir` 2: If root, use system puppet.conf 3: Otherwise, use ~/.puppet/puppet.conf
Contributor
Author
|
Closing this because we'd rather see this go into 3.1.x instead of 3.0.0 at this point. |
Contributor
Author
|
New pull request against master: #1190 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Without this patch applied
puppet masterwill explicitly set the valuefor confdir and vardir inside of Puppet::Application::Master#app_defaults.
This is a problem because it calls a method that does not exist while
trying to do so.
This patch fixes the problem by implementing the intended behavior
documented in #15337, and specifically in commit 38cba0a. This intended
behavior is:
--confdir(#7316) Add spec coverage for Puppet::Application::Master#app_defaults
Without this patch we don't have any spec test coverage for the
app_defaults instance method of the Puppet::Application::Master class.
This lack of coverage is problem because cherry picking the confdir and
vardir patch from PR-882 in commit b064ee6 appears to work just fine
after resolving the merge conflicts. Things were not fine, however,
because the app_defaults method makes a call that raises an exception
and none of our spec tests caught this issue.
The acceptance tests did, however, by exercising the command
puppet master --configprint pidfileRevert "Revert "Merge branch
'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x""
This reverts commit ef3fe69.