diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-08-04 11:55:23 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-08-04 17:49:09 -0700 |
| commit | 6aac8f0185db1d153583230de726c30ce949fc78 (patch) | |
| tree | 4e90b6b96f6c137cc7ddfcb2319061e569574055 /lib/puppet/application | |
| parent | 1cba9a7a713261fd62ceec440a3e57667eb103ba (diff) | |
| download | puppet-6aac8f0185db1d153583230de726c30ce949fc78.tar.gz puppet-6aac8f0185db1d153583230de726c30ce949fc78.tar.xz puppet-6aac8f0185db1d153583230de726c30ce949fc78.zip | |
[#4467] Make Puppet Master respect facts_terminus settings
* Remove hard-coded facts terminus in master
* Change facts_terminus default to 'yaml' for master and 'facter' for
everything else.
Paired-with: Matt Robinson <matt@puppetlabs.com>
Signed-off-by: Rein Henrichs <rein@puppetlabs.com>
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/master.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb index 777a50eaa..fde474907 100644 --- a/lib/puppet/application/master.rb +++ b/lib/puppet/application/master.rb @@ -138,9 +138,6 @@ class Puppet::Application::Master < Puppet::Application Puppet.settings.use :main, :master, :ssl - # A temporary solution, to at least make the master work for now. - Puppet::Node::Facts.terminus_class = :yaml - # Cache our nodes in yaml. Currently not configurable. Puppet::Node.cache_class = :yaml |