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/defaults.rb | |
| 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/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 1c5ca53f1..028f9118c 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -115,7 +115,7 @@ module Puppet :node_terminus => ["plain", "Where to find information about nodes."], :catalog_terminus => ["compiler", "Where to get node catalogs. This is useful to change if, for instance, you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."], - :facts_terminus => ["facter", "Where to get node facts."], + :facts_terminus => [Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', "The node facts terminus."], :httplog => { :default => "$logdir/http.log", :owner => "root", :mode => 0640, |