diff options
| author | Markus Roberts <Markus@reality.com> | 2011-02-01 16:22:06 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2011-02-01 16:22:06 -0800 |
| commit | adb8c7994ea7d2d30aaea698fbe08727ed553fef (patch) | |
| tree | 3f8f7b605dc9ad999409353266e7e3130667e697 /lib/puppet/util/command_line | |
| parent | 517c6794606e9adde7f2912d3b949cfcc18a446a (diff) | |
| parent | 443eba9b7a85cffa6b8513a32a620c80917be768 (diff) | |
| download | puppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.tar.gz puppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.tar.xz puppet-adb8c7994ea7d2d30aaea698fbe08727ed553fef.zip | |
Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
Diffstat (limited to 'lib/puppet/util/command_line')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 3 | ||||
| -rwxr-xr-x | lib/puppet/util/command_line/puppetmasterd | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index cb8589c5f..7d78ce90f 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -150,7 +150,8 @@ # # test:: # Enable the most common options used for testing. These are +onetime+, -# +verbose+, +ignorecache, +no-daemonize+, and +no-usecacheonfailure+. +# +verbose+, +ignorecache, +no-daemonize+, +no-usecacheonfailure+, +# +detailed-exit-codes+, +no-splay+, and +show_diff+. # # noop:: # Use +noop+ mode where the daemon runs in a no-op or dry-run mode. This is useful 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 |