diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-01 14:25:47 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-01 14:25:47 -0800 |
| commit | 1a78484a0d687914c146456f79aad857c5d243a0 (patch) | |
| tree | 8ffb9cd342d1f29ce33e167c9bdc40722725c444 | |
| parent | f135a6436084629d47c6b3b590dadb14952e4d69 (diff) | |
| parent | 1fd3600458b8561d33d34369d349ecefee04996b (diff) | |
| download | puppet-1a78484a0d687914c146456f79aad857c5d243a0.tar.gz puppet-1a78484a0d687914c146456f79aad857c5d243a0.tar.xz puppet-1a78484a0d687914c146456f79aad857c5d243a0.zip | |
Merge remote branch 'jamtur01/tickets/2.6.x/3646' into 2.6.next
* jamtur01/tickets/2.6.x/3646:
Fixed #3646 - Added documentation for compile and apply to man page
| -rwxr-xr-x | lib/puppet/util/command_line/puppetmasterd | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd index baf8a7581..445169820 100755 --- a/lib/puppet/util/command_line/puppetmasterd +++ b/lib/puppet/util/command_line/puppetmasterd @@ -9,6 +9,7 @@ # # puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] # [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version] +# [--compile <nodename>] [--apply <catalog>] # # = Description # @@ -49,6 +50,14 @@ # version:: # Print the puppet version number and exit. # +# compile:: +# Capability to compile a catalogue and output it in JSON from the Puppet master. Uses +# facts contained in the $vardir/yaml/ directory to compile the catalog. +# +# apply:: +# Capability to apply JSON catalog (such as one generated with --compile). You can either specify +# a JSON file or pipe in JSON from standard input. +# # = Example # # puppet master |