summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/puppet.rb
Commit message (Collapse)AuthorAgeFilesLines
* Renaming the old puppet executableRein Henrichs2010-02-171-181/+0
|
* Merge branch '0.25.x'Markus Roberts2010-02-091-3/+8
|\ | | | | | | | | | | | | | | | | | | Conflicts: lib/puppet/agent.rb lib/puppet/application/puppet.rb lib/puppet/configurer.rb man/man5/puppet.conf.5 spec/integration/defaults.rb spec/unit/configurer.rb
| * Fixing #2914 - pre/post hooks now work for transactionsLuke Kanies2010-01-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was built to be used with etckeeper to version control files in /etc, but can be used for essentially anything. This patch was built to be added to 0.25.4, so it's a least-modify approach. A better approach would be to refactor application/puppet.rb just a bit so it uses Configurer more. This is a simple patch - it just defines 'prerun_command' and 'postrun_command' settings, and runs the appropriate command around each transaction if they're set. Signed-off-by: Luke Kanies <luke@reductivelabs.com>
* | Merge branch '0.25.x'James Turnbull2010-01-131-1/+1
|\| | | | | | | | | | | Conflicts: lib/puppet/ssl/host.rb spec/spec_helper.rb
| * Fix for #2943 (Make puppet --apply respect --preferred_serialization_format)Markus Roberts2009-12-211-1/+1
| | | | | | | | Signed-off-by: Markus Roberts <Markus@reality.com>
* | Fix #1934 - detailed-exitcodes for puppetdDeepak Giridharagopal2009-11-191-4/+3
|/ | | | | | | | | | | | | | | | | | | | | | This option only works when --onetime is specified, as it doesn't make much sense to worry about exit codes in the context of a long-running daemon. This required a refactoring of the existing --detailed-exitcodes code, as "puppetd" wasn't directly creating a transaction object (like "puppet" does). Added Report::exit_status, which did what was previously hard-coded into the "puppet" executable. An Agent's "run" method now returns a value (the result of the individual client class' "run" method) The "puppetd" agent's "run" method now returns a transaction report, as that seems like the logical thing to return as the result of applying a catalog. Signed-off-by: Deepak Giridharagopal <deepak@brownman.org>
* Bundling of pure ruby json lib as "pson"Markus Roberts2009-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundeling and renaming the pure ruby json library to addresses a number of cross version serliaization bugs (#2615, et al). This patch adds a subset of the files from the json_pure gem to lib/puppet/external/pson (renamed to avoid conflicts with rails) so that we will always have a known-good erialization format available. The pure ruby json gem as distibuted defers to the compiled version if it is installed. This is problematic in some circumstances so the files that have been brought over have been modified to always and only use the bundled version. It's a large patch, so here's a breakdown of the change categories: The majority of the lines are only marginally interesting: * The json lib itself (in lib/puppet/external/pson) make up the bulk of the lines. * Renaming of json to pson make up the second largest group. Somewhat more interesting are the following, which can be located by searching the diffs for the indicated strings: * Adjusting tests to reflect the changes * Changing the encoding/decoding behavior so that nested structures (e.g. resources) don't serialize as escaped strings. This should make it much easier to process the results with external tools, if needed. Search for "to_pson" and "to_pson_data_hash" * Cleaning up the envelope/metadata * Now provides a document_type (as opposed to a ruby class name) by using a symple registration scheme instead of constant lookup (search for "document_type") * Added an api_version (search for "api_version") * Added a hash for document metadata (search for "metadata") * Removing the yaml monkeypatch and instead disabling yaml serialization on ruby 1.8.1 in favor of pson (search for "yaml") * Cleaning up the json/rails feature interaction (they're now totally independent) (search for "feature")
* Ticket 2559 -- parseonly ignored specified fileMarkus Roberts2009-08-221-0/+6
| | | | | | | | In the command-line option parsing refactor from 0.24.x the manifest specification was lost for --parseonly, so site.pp was always used. This patch adds the parsing back in. Signed-off-by: Markus Roberts <Markus@reality.com>
* Adding #2477 - puppet can apply provided catalogsLuke Kanies2009-08-021-8/+42
| | | | | | | | | | | | This provides the other half of #2440 - you can compile catalogs into json with puppetmasterd, and now you can take those json catalogs and apply them. This allows you to use whatever mechanism you want to ship the catalogs around. Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixed #2280 - Detailed exit codes fixJames Turnbull2009-05-271-1/+1
|
* Fixing puppet -e; it got broken in the move to ApplicationLuke Kanies2009-04-171-1/+3
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Relying on 'should_parse_config' in the 'puppet' applicationLuke Kanies2009-02-191-5/+0
| | | | | | | | There was some redundancy here, as the app was marked as needing to parse the config, but then the setup hook manually parsed it. Signed-off-by: Luke Kanies <luke@madstop.com>
* Move --version handling to Puppet::ApplicationBrice Figureau2009-02-161-5/+0
| | | | Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Move puppet to the Application Controller paradigmBrice Figureau2009-02-161-0/+145
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>