New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#7316) Do not set default values for confdir and vardir in the master #1190

Merged
merged 3 commits into from Oct 2, 2012

Conversation

Projects
None yet
2 participants
@jeffmccune
Contributor

jeffmccune commented Sep 26, 2012

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

(#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 pidfile

jeffmccune added some commits Sep 26, 2012

(#7316) Do not set default values for confdir and vardir in 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
(#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 pidfile`

zaphod42 added a commit that referenced this pull request Oct 2, 2012

Merge pull request #1190 from jeffmccune/fix/master/7316_load_faces_f…
…rom_modulepath_try4

(#7316) Do not set default values for confdir and vardir in the master

Conflicts:
	lib/puppet/settings.rb

Merge conflict config file parsing related to a disallowed section replicated
in the config_file.rb parser.

@zaphod42 zaphod42 merged commit 3b7977a into puppetlabs:master Oct 2, 2012

jeffmccune added a commit that referenced this pull request Oct 4, 2012

Revert "Merge pull request #1190 from jeffmccune/fix/master/7316_load…
…_faces_from_modulepath_try4"

This reverts commit bdda511, reversing
changes made to 8f9699c.

Conflicts:
	lib/puppet/settings/config_file.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment