summaryrefslogtreecommitdiffstats
path: root/lib/puppet
Commit message (Collapse)AuthorAgeFilesLines
* (#6126) Puppet inspect now reports status after run completes.Daniel Pittman2011-02-181-57/+59
| | | | | | | | We now emit timing and output a status message at the end of a successful inspect run. Paired-With: Nick Lewis <nick@puppetlabs.com> Signed-Off-By: Daniel Pittman <daniel@puppetlabs.com>
* (#6364) Adjust mis-translated regex in mount provider for AIXJacob Helwig2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | The commit to simplify the regex used to parse the output from the mount command on AIX (50c12e55b6f8462f6904ae061e661d1d10c7590a) mis-translated it. The original regex was grabbing the 3rd space-separated element, not the 2nd. This mis-translation caused the provider to grab the device information instead of the mount point, and compare that to the desired mount point. This would cause Puppet to think that the mount was never actually mounted under normal circumstances. The code from 50c12e5 was passing the tests because the fixture data did not include the mandatory leading whitespace that the original regex was looking for. The updated fixture data is pulled from the mount manpage from AIX v6r1. Reviewed-by: Paul Berry <paul@puppetlabs.com>
* (#3646) Fix the documentation fix for `puppet apply --apply`Jacob Helwig2011-02-142-6/+5
| | | | | | | --apply is actually off of `puppet apply`, not off of `puppet agent` (nor `puppet master`), so move the documentation accordingly. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* Updated fix for #3646 - apply / compile documentationJames Turnbull2011-02-142-8/+9
|
* Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.nextJesse Wolfe2011-02-081-2/+6
|\
| * (5977) Puppet::Applications can be loaded from multiple paths.Dan Bode2011-01-141-2/+6
| | | | | | | | | | | | | | - previously, Puppet would search $LOAD_PATH and just load applications in the first $LOAD_PATH to have the directory puppet/application. Now multiple paths can contain applications.
* | (#6257) Speed up PUT and POST requests under rackJesse Wolfe2011-02-081-3/+1
| | | | | | | | | | | | | | This patch significantly speeds up reading the body of HTTP requests from Rack. Reviewed-by: Markus Roberts <markus@puppetlabs.com>
* | Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.nextPaul Berry2011-02-031-0/+2
|\ \ | | | | | | | | | | | | * bug/2.6.next/5755-gc-issue: Fix for #5755 -- making zaml serialization robust over projected objects
| * | Fix for #5755 -- making zaml serialization robust over projected objectsMarkus Roberts2011-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core problem arose when the fix for #5048 in 31118fe85aca4 introduced a hook to replace objects dynamically durring serialization so that they could be projected / rewritten to a different form for backward compatability. The serialization code assumed that all objects being serialized would remain valid until the serialization was complete, but nothing retained a copy of the temporary objects created in the hook. To resolve this, the serialization layer now maintains a ref to each such object and clears them (to allow GC) after serialization is complete. Paired-with: Jesse Wolfe <jesse@puppetlabs.com> Paired-with: Paul Berry <paul@puppetlabs.com>
* | | Merge branch 'docs/2.6.next/inspect-help' into 2.6.nextJesse Wolfe2011-02-031-0/+53
|\ \ \
| * | | (#6018) Nick F's --help text for puppet inspect.Jesse Wolfe2011-02-031-0/+53
| | | |
* | | | (#5823) document the not-an-API status of set_run_modeDaniel Pittman2011-02-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is totally not API, document that in big, threatening letters so that folks actually know what is going on. Include promises so they don't feel too unhappy with us. Paired-with: matt@puppetlabs.com
* | | | Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into ↵Daniel Pittman2011-02-031-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | 2.6.next
| * | | | (#5823) run mode can now be set dynamically...Daniel Pittman2011-02-031-3/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third party scripts, and complex command line tools, depend on being able to configure the run_mode value at runtime, not just when they fire up. For better or worse we used to allow this sort of thing to work, but stopped, and we have no sane, safe and consensual alternative, so we broke a bunch of client code. This enables the feature again, but does not add any safety catch; you can now happily slice off your own feet with this, if you really want to.
* / / / (6114) Update the audit metaparameter for 2.6.5.nfagerlund2011-02-031-6/+19
|/ / / | | | | | | | | | The audit metaparameter has some new behavior, its old behavior has changed, and the previous description was incomplete at any rate. This patch replaces its description string.
* / / (#4139) hook log autoflush into global defaultsDaniel Pittman2011-02-033-1/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously had an ordering dependency in the autoflush option, which was statically read from defaults when the log destination was configured. We add a hook in the defaults to update the log subsystem, which in turn updates log destinations, when autoflush is changed. This would work as desired: puppet agent --autoflush --logdest=file This would not work, as autoflush would be false: puppet agent --logdest=file --autoflush Now those changes propagate correctly. Paired-with: matt@puppetlabs.com
* | Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-0112-35/+43
|\ \
| * \ Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.nextPaul Berry2011-02-011-2/+7
| |\ \ | | | | | | | | | | | | | | | | * bodepd/feature/2.6.4/5910: (#5910) Improved logging when declared classes cannot be found:
| | * | (#5910) Improved logging when declared classes cannot be found:Dan Bode2011-01-121-2/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | Previously, when a class could not be found, it was displaying the same error message as when a resource type could not be found. This resulted in confusing error message: Invalid resource type class, when really it should display the name of the class that could not be found. My patch changes the error message to: Could not find declared class #{title}
| * | Merge branch 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet into ↵Jacob Helwig2011-02-011-2/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet: (#5913) Fix Puppet::Application.find constant lookup behavior
| | * | (#5913) Fix Puppet::Application.find constant lookup behaviorMitchell Hashimoto2011-01-161-2/+9
| | | | | | | | | | | | | | | | | | | | Puppet::Application.find now only looks in the Puppet::Application namespace for the given constant.
| * | | Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.nextJesse Wolfe2011-02-013-16/+4
| |\ \ \
| | * | | Fixes #5916 - Cleanup of unused doc methods and documentationJames Turnbull2011-01-173-16/+4
| | |/ /
| * | | Merge remote branch 'james/tickets/2.6.x/5914' into 2.6.nextJesse Wolfe2011-02-011-1/+1
| |\ \ \
| | * | | Fixed #5914 Removed genconfig = true from genconfig outputJames Turnbull2011-01-201-1/+1
| | |/ /
| * | | Merge remote branch 'jamtur01/tickets/2.6.x/6071' into 2.6.nextJacob Helwig2011-02-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/6071: Fixed #6071 - Fixed typo and improved exec path error message
| | * | | Fixed #6071 - Fixed typo and improved exec path error messageJames Turnbull2011-01-301-2/+2
| | | | |
| * | | | Merge branch 'tickets/2.6.x/5564' into 2.6.nextPaul Berry2011-02-011-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/5564: Fixed #5564 - Added some more fqdn_rand documentation
| | * | | | Fixed #5564 - Added some more fqdn_rand documentationJames Turnbull2011-02-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Berry <paul@puppetlabs.com>
| * | | | | Merge remote branch 'james/tickets/2.6.x/6002' into 2.6.nextJesse Wolfe2011-02-011-0/+4
| |\ \ \ \ \
| | * | | | | Fixed #6002 - Added note about function executionJames Turnbull2011-01-251-0/+4
| | | | | | |
| * | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/5736' into 2.6.nextJacob Helwig2011-02-011-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/5736: Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate description of --clean.
| | * | | | | | Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate ↵nfagerlund2011-01-171-2/+2
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | description of --clean.
| * | | | | | Merge branch 'tickets/2.6.x/5167' into 2.6.nextMatt Robinson2011-02-011-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/5167: Fixed #5167 - misleading documentation in the defaults of [main]
| | * | | | | | Fixed #5167 - misleading documentation in the defaults of [main]James Turnbull2011-01-171-2/+2
| | |/ / / / /
| * | | | | | Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.nextJesse Wolfe2011-02-011-5/+6
| |\ \ \ \ \ \
| | * | | | | | Fixed #5742 - Removed legacy fqdn option from documentationJames Turnbull2011-01-171-5/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Patch from: Nick Fagerlund
* | / / / / / Fix to fix for #5755 -- backref serialization issues in zamlMarkus Roberts2011-02-011-27/+25
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit addresses the original issue that the change reverted in the previous commit for #5755 was intended to fix by removing the special case on labels in emit (lables, even if they are never generated, are not "new lines" and thus @recent_nl should always be set to false when one is emitted). It also partially addresses a related issue wherein temporary strings generated when field names are constructed recycle their object_id (they are temporary) and thus cause incorrect back references. This commit "fixes" the problem by never generating backrefs to strings (treating them as immutable). It does not address other suspected issues such as thread safety durring serialization due to the use of class variables to store the seen-object hash or the use of object ids as "permanently unique" identifiers. Paired with: Daniel Pittman Advice & Commiseration: Jesse Wolfe
* | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.nextJacob Helwig2011-02-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/1657: Fixed #1657 - Added note about target file
| * | | | | | Fixed #1657 - Added note about target fileJames Turnbull2011-01-171-1/+1
| |/ / / / /
* | | | | | Merge branch 'ticket/2.6.next/3165' into 2.6.nextPaul Berry2011-02-012-21/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * ticket/2.6.next/3165: Fix #3165 Ralsh (bin/puppet resource) can't manage files
| * | | | | Fix #3165 Ralsh (bin/puppet resource) can't manage filesJesse Wolfe2011-01-232-21/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on the patch submitted by Owen Smith. File management was being blocked by two problems: an obsolete, broken `instances` method for the file type, and a bug in the way resource/ral handled slashes in resource names. This patch makes two changes to Owen's version: 1) our unit tests caught an unexpected ruby quirk: "text/".split("/") and "text/".split("/", 2) do not return the same values. 2) File.instances now reproduces the old behavior of listing files in the root directory. This is now implemented in terms of the existing file recursion feature.
* | | | | Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.nextJacob Helwig2011-02-011-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694': Fixed #4968 - Updated list of options turned on by --test in documentation
| * | | | | Fixed #4968 - Updated list of options turned on by --test in documentationJames Turnbull2011-02-011-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
* | | | | Merge branch 'feature/master/5061' into 2.6.nextPaul Berry2011-02-011-13/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/master/5061: (#5061) - allow special hostclass/define variables to be evaluated as defaults.
| * | | | | (#5061) - allow special hostclass/define variables to be evaluated as defaults.Dan Bode2011-02-011-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have always been annoyed that special variables for defines and hostclasses can not be evaluated as param defaults. Special variables are: $name, $title, $module_name. Code example: class x ( foo = $name ) { notice($foo)} should print x, and with my patch, it does. Reviewed-by: Paul Berry <paul@puppetlabs.com>
* | | | | | Merge branch 'ticket/2.6.next/5045' into 2.6.nextMatt Robinson2011-02-012-6/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5045: (#5045) Cleaning up some tests and code (#5045) External node classifiers should be able to specify params for classes (#5045) Adds support to resource/type to also accept a param hash
| * | | | | | (#5045) Cleaning up some tests and codeMatt Robinson2011-01-242-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed some variables to be clearer, made tests use less stubbing, added some additional tests and got rid of some unecessary logic. Paired-with: Dan Bode
| * | | | | | (#5045) External node classifiers should be able to specify params for classesDan Bode2011-01-241-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It facilitates the support for param classes from the ENC. It adds support for classes to be passed as a hash to the evaluate_classes method. If a hash of classes is specified, it also evaluates duplicates. I also had to convert the hash to an array for tags to be applied correctly. Reviewed-by: Matt Robinson
| * | | | | | (#5045) Adds support to resource/type to also accept a param hashDan Bode2011-01-241-3/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The params are added as attributes when the resource is created. Also, even if the class already exists, if params are passed, we still try to create it. Reviewed-by: Matt Robinson