diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-02-16 15:09:56 -0800 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-02-17 11:34:22 -0800 |
| commit | bd14ff5e1ea5bad3e1cba1fd19610f63158c5bc4 (patch) | |
| tree | 61fb589bdadba96064c9e386c8292b5aa93207cb /lib/puppet/application | |
| parent | 768d9a1a796b631de7ec4da2e75ec52211716c9a (diff) | |
| download | puppet-bd14ff5e1ea5bad3e1cba1fd19610f63158c5bc4.tar.gz puppet-bd14ff5e1ea5bad3e1cba1fd19610f63158c5bc4.tar.xz puppet-bd14ff5e1ea5bad3e1cba1fd19610f63158c5bc4.zip | |
(#1204) Fix --compile and --apply options
Forward-porting a fix from 2.6.x to the new help text locations.
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/apply.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/application/master.rb | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb index 37029cfb5..a1edf6243 100644 --- a/lib/puppet/application/apply.rb +++ b/lib/puppet/application/apply.rb @@ -40,7 +40,8 @@ Applies a standalone Puppet manifest to the local system. USAGE ----- puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] - [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>] <file> + [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>] + [--apply <catalog>] <file> DESCRIPTION @@ -98,6 +99,10 @@ configuration options can also be generated by running puppet with * --verbose: Print extra information. +* --apply: + Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can + either specify a JSON file or pipe in JSON from standard input. + EXAMPLE ------- diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb index 39af33dc8..f689b9e01 100644 --- a/lib/puppet/application/master.rb +++ b/lib/puppet/application/master.rb @@ -41,7 +41,7 @@ USAGE ----- puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version] - [--compile <nodename>] [--apply <catalog>] + [--compile <node-name>] DESCRIPTION @@ -89,14 +89,8 @@ with '--genconfig'. 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. + Compile a catalogue and output it in JSON from the puppet master. Uses + facts contained in the $vardir/yaml/ directory to compile the catalog. EXAMPLE |