summaryrefslogtreecommitdiffstats
path: root/lib/puppet/defaults.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/defaults.rb')
-rw-r--r--lib/puppet/defaults.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index fce928ce5..7c57dcd6d 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -427,7 +427,10 @@ module Puppet
:ca_server => ["$server", "The server to use for certificate
authority requests. It's a separate server because it cannot
and does not need to horizontally scale."],
- :ca_port => ["$masterport", "The port to use for the certificate authority."]
+ :ca_port => ["$masterport", "The port to use for the certificate authority."],
+ :catalog_format => ["yaml", "What format to use to dump the catalog. Only supports
+ 'marshal' and 'yaml'. Only matters on the client, since it asks the server
+ for a specific format."]
)
self.setdefaults(:filebucket,