diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-06-30 12:43:23 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-01 13:48:03 -0700 |
| commit | 2a2588392a2eead4265afcb93ff7bc16b5fc1ef1 (patch) | |
| tree | 128c7039ced805af716cd49c25690634de5243ad /lib/puppet/util/settings.rb | |
| parent | 75e0662168936da8255507a10bccad8889326947 (diff) | |
| download | puppet-2a2588392a2eead4265afcb93ff7bc16b5fc1ef1.tar.gz puppet-2a2588392a2eead4265afcb93ff7bc16b5fc1ef1.tar.xz puppet-2a2588392a2eead4265afcb93ff7bc16b5fc1ef1.zip | |
[#4090] Git rid of the idea that run_mode is a configurable option with defaults
Along the way this fixes an issue with 2.6 alpha that sections of the
puppet config file were getting ignored.
Diffstat (limited to 'lib/puppet/util/settings.rb')
| -rw-r--r-- | lib/puppet/util/settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 398fa482c..3e2020c55 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -284,9 +284,9 @@ class Puppet::Util::Settings end end - # Figure out the section name for the mode. + # Figure out the section name for the run_mode. def run_mode - convert(@config[:run_mode].default).intern if @config[:run_mode] + Puppet.run_mode.name end # Return all of the parameters associated with a given section. |