summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'ticket/2.6.next/6856-dangling-symlinks' into 2.6.nextMax Martin2011-04-082-0/+2
|/| | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6856-dangling-symlinks: (#6856) Copy dangling symlinks with 'links => manage' File resource.
| * | | (#6856) Copy dangling symlinks with 'links => manage' File resource.Max Martin2011-04-082-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When copying symlinks with 'links => manage', there is no need to examine the content of the link target, since the link is supposed to be copied as-is. Skip copying this value to the resource from the metadata (source), since the content will be nil in the dangling symlink case. Paired-with: Jacob Helwig
* | | Merge branch '2.6.next' into 2.6.xMax Martin2011-04-0724-74/+314
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: Fix #4339 - Locally save the last report to $lastrunreport Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml Fixed #3127 - removed legacy debug code Fixed #3127 - Fixed gem selection regex (#5437) Invalidate cached TypeCollection when there was an error parsing (#6937) Adjust formatting of recurse's desc (#6937) Document the recurse parameter of File type. (#6893) Document the cron type in the case of specials. (#5670) Don't trigger refresh from a failed resource Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
| * \ \ Merge commit '647a640fcac281e3a8cda05b92b51c44c93f1d19' into 2.6.nextNick Lewis2011-04-071-1/+3
| |\ \ \
| | * | | (#6893) Document the cron type in the case of specials.Ben Hughes2011-03-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add in a better desc block for "specials" in cron provider, and outline it's limitations. The previous text was purely a placeholder.
| * | | | Merge branch 'tickets/2.6.x/4339' into 2.6.nextJacob Helwig2011-04-0513-23/+215
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/4339: Fix #4339 - Locally save the last report to $lastrunreport Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml
| | * | | | Fix #4339 - Locally save the last report to $lastrunreportBrice Figureau2011-04-057-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the cache terminus system, when --report is on, we are now caching the last report as a yaml file in the $lastrunreport file (which by default is $statedir/last_run_report.yaml). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| | * | | | Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yamlBrice Figureau2011-04-057-23/+144
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once a configuration run is done, puppetd will save on the node a yaml summary report roughly akin to: --- time: notify: 0.001025 last_run: 1289561427 schedule: 0.00071 config_retrieval: 0.039518 filebucket: 0.000126 resources: changed: 1 total: 8 out_of_sync: 1 events: total: 1 success: 1 changes: total: 1 This is almost an hash version of the current --summarize output, with the notable exception that the time section includes the last run unix timestamp. The whole idea is to be able to monitor locally if a puppetd does its job. For instance this could be used in a nagios check or to send an SNMP trap. The last_run information might help detect staleness, and this summary can also be used for performance monitoring (ie time section). The resource section can also show the number of failed resources. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | Merge branch 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet into ↵Jacob Helwig2011-04-041-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet: Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
| | * | | | Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking ↵James Turnbull2011-03-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.9
| * | | | | Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-051-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/3127: Fixed #3127 - removed legacy debug code
| | * | | | | Fixed #3127 - removed legacy debug codeJames Turnbull2011-04-051-1/+0
| | | | | | |
| * | | | | | Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-042-3/+14
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * tickets/2.6.x/3127: Fixed #3127 - Fixed gem selection regex
| | * | | | Fixed #3127 - Fixed gem selection regexJames Turnbull2011-04-042-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the gem json_pure was installed and you requested the gem json then the regex matched too soon and falshly indicated that the json gem was already installed. Also updated to add the --no-ri and no-rdoc options and fix tests.
| * | | | | Merge branch 'ticket/2.6.x/5437-report-manifest-errors-on-agent' into 2.6.nextJacob Helwig2011-04-014-16/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/5437-report-manifest-errors-on-agent: (#5437) Invalidate cached TypeCollection when there was an error parsing
| | * | | | | (#5437) Invalidate cached TypeCollection when there was an error parsingJacob Helwig2011-04-014-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The caching of the TypeCollection in Puppet::Node::Environment would cause parse errors to occur (and be reported) only once and never again, until the file had changed on disk. This would also cause empty catalogs to be sent down to the agents further hiding the problem. Now, when a file fails to parse, it will be re-parsed every time on every following compilation, causing the parse error to be reported every time, and preventing sending down empty catalogs to agents. Paired-with: Nick Lewis <nick@puppetlabs.com>
| * | | | | | (#6937) Adjust formatting of recurse's descnfagerlund2011-04-011-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevous formatting would result in broken Markdown after the docs were generated, as Markdown does not recognize a two-space tab as a syntactical element. This patch also changes the list of values to a bulleted list instead of a code block.
| * | | | | | (#6937) Document the recurse parameter of File type.Ben Hughes2011-04-011-1/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the desc block with information gleaned from #1469 and the code about recurse => remote and other types of recursion. The auto generated documentation was sparse and this is an area that often comes up on the mailing list/IRC.
| * | | | | Merge branch 'ticket/2.6.next/5670' into 2.6.nextNick Lewis2011-03-302-28/+35
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (#5670) Don't trigger refresh from a failed resourceNick Lewis2011-03-302-28/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources were triggering their subscribing/notified resources when they failed, which is incorrect. Now, events are only queued if the resource was successful. Paired-With: Max Martin
* | | | | (maint) Indentation fixesMarkus Roberts2011-04-062-15/+13
| | | | |
* | | | | (#6490) Add plugin initialization callback system to coreMarkus Roberts2011-04-063-5/+100
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recurring pattern "drop-in code needs to have something done at startup" is presently being solved with a variety of ad-hock mechanism. This commit adds a general, extensible, centralized system for adding such hooks and manages an extensible set of metadata about plugins which it collects by searching for files named "plugin_init.rb" in a series of directories. Initially, these are simply the $LOAD_PATH. Applications can add more places to look for plugins without risk of adding duplicates or changing the order of ones that have already been found with: Puppet::Plugins.look_in(*paths) The contents of each file found is executed in the context of a Puppet::Plugins object (and thus scoped). An example file might contain: ------------------------------------------------------- @name = "Greet the CA" @description = %q{ This plugin causes a friendly greeting to print out on a master that is operating as the CA, after it has been set up but before it does anything. } def after_application_setup(options) if options[:application_object].is_a?(Puppet::Application::Master) && Puppet::SSL::CertificateAuthority.ca? puts "Hey, this is the CA! Hi everyone!!!" end end ------------------------------------------------------- Note that the instance variables are local to this Puppet::Plugin (and so may be used for maintaining state, etc.) but the plugin system does not provide any thread safety assurances, so they may not be adequate for some complex use cases. Presently supported hooks: before_application_preinit( :application_object => ... ) after_application_preinit( :application_object => ... ) before_application_parse_options( :application_object => ... ) after_application_parse_options( :application_object => ... ) before_application_setup( :application_object => ... ) after_application_setup( :application_object => ... ) before_application_run_command( :application_object => ... ) after_application_run_command( :application_object => ... ) on_commandline_initialization(:command_line_object => ... ) on_application_initialization(:appliation_object => ... ) Paired-with: Daniel Pitman
* | | | Merge branch '2.6.next' into 2.6.xMax Martin2011-03-3038-528/+1874
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (23 commits) (#5908) Add support for new update-rc.d disable API (#6862) Add a default subject for the mail_patches rake task Fixed #6256 - Creation of rrd directory. (#5477) Allow watch_file to watch non-existent files, especially site.pp (#5221) Add test for fix to fileset with trailing separator (#5221) Fix fileset path absoluteness checking with trailing slash (#4769) Fix negative timeout support for newer rubies Fixed #6562 - Minor kick documentation fix (#6658) Propagate ENC connection errors to the agent (#4884) Remove typo from spec test (#4884) Modify tests to pass on non-OS X systems (#4884) Revise new exec tests, add a few more (4576) - if ENC declares invalid class, it is logged at warning. (#4884) Add an shell provider for execs (#4884) Fix Test::Unit exec tests (#4884) Break the exec type out to have a posix provider (#4884) Add consistent path validation and behavior (#4884) Add expand_path to requiring the spec_helper (#4884) Autorequire shared behaviors and method to silence warnings (#4884) Fix whitespace ...
| * \ \ \ Merge branch 'ticket/2.6.next/5908-update-rc' into 2.6.nextMax Martin2011-03-302-4/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5908-update-rc: (#5908) Add support for new update-rc.d disable API
| | * | | | (#5908) Add support for new update-rc.d disable APIMax Martin2011-03-302-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the new disable API to update-rc.d and added spec tests to check this functionality. This change was made because in versions of sysv-rc >= 2.88, 'update-rc.d stop' is broken and actually enables the service. We only changed the disable case as the enable case still works on systems which use sysv-rc 2.88 or greater (atm, only Debian Lenny). We wanted to change as little as possible because update-rc.d prints a message stating that the new enable/disable API is unstable and may change in the future. Paired-with:Matt Robinson, Jacob Helwig
| * | | | | Merge branch 'tickets/2.6.x/6862' into 2.6.nextJacob Helwig2011-03-281-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * tickets/2.6.x/6862: (#6862) Add a default subject for the mail_patches rake task
| | * | | | (#6862) Add a default subject for the mail_patches rake taskBrice Figureau2011-03-261-1/+3
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent committers to forget to write cover letter subject when rake mail_patches needs to send multiple e-mails. It defaults to the "type" and "branch name" of the patch-set. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | Merge branch 'tickets/2.6.x/6256' into 2.6.nextJames Turnbull2011-03-263-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6256: Fixed #6256 - Creation of rrd directory.
| | * | | | Fixed #6256 - Creation of rrd directory.James Turnbull2011-03-263-3/+4
| | | |/ / | | |/| | | | | | | | | | | | Added :metrics to the settings used by the master
| * | | | Merge branch 'ticket/2.6.next/5477' into 2.6.nextJesse Wolfe2011-03-259-28/+40
| |\ \ \ \
| | * | | | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-259-28/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The watch_file mechanism would refuse to monitor paths to files that didn't exist. This patch makes it possible to watch a file that hasn't been created yet, so when it is created, you manifests will get reparsed. Backported this change to 2.6.x Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.6.next/5221' into 2.6.nextNick Lewis2011-03-242-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (#5221) Add test for fix to fileset with trailing separatorNick Lewis2011-03-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Pieter van de Bruggen
| | * | | | (#5221) Fix fileset path absoluteness checking with trailing slashJames Turnbull2011-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Nick Lewis Reviewed-By: Pieter van de Bruggen
| * | | | | Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet ↵Jesse Wolfe2011-03-242-3/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 2.6.next
| | * | | | | (4576) - if ENC declares invalid class, it is logged at warning.Dan Bode2011-03-162-3/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | used to be at info, so you had to run the master on verbose to see it an ENC was trying to declare a class that could not be loaded.
| * | | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-241-2/+3
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * 2.6.x: Update CHANGELOG for 2.6.7
* | | | | | Update CHANGELOG for 2.6.7Jacob Helwig2011-03-241-2/+3
| |/ / / / |/| | | |
| * | | | Merge branch 'ticket/2.6.next/4769' into 2.6.nextNick Lewis2011-03-242-10/+20
| |\ \ \ \
| | * | | | (#4769) Fix negative timeout support for newer rubiesNick Lewis2011-03-242-10/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In new versions of Ruby, negative timeouts are unsupported. So munge negatives to zero in the parameter. Reviewed-By: Jacob Helwig
| * | | | Merge branch 'tickets/2.6.x/6562' into 2.6.nextJames Turnbull2011-03-221-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6562: Fixed #6562 - Minor kick documentation fix
| | * | | | Fixed #6562 - Minor kick documentation fixJames Turnbull2011-03-221-1/+0
| | | | | |
| * | | | | Merge branch 'ticket/2.6.next/6658' into 2.6.nextMatt Robinson2011-03-182-5/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6658: (#6658) Propagate ENC connection errors to the agent
| | * | | | | (#6658) Propagate ENC connection errors to the agentMatt Robinson2011-03-182-5/+3
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the master failed to run the External Node Classifier script it would log an error on the master, but the agent didn't get back the full error or the stack trace for it's logs. By raising when there's an ENC script problem on the master, this causes the error messages to propagate to the agent. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.6.x/5814' into 2.6.nextMax Martin2011-03-181-18/+466
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/5814: (#5814) Improved cron type specs (#5814) cron_spec shouldn't depend on cron provider
| | * | | | | (#5814) Improved cron type specsStefan Schulte2011-01-091-17/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs to test value validation for minute, hour, weekday, month and monthday
| | * | | | | (#5814) cron_spec shouldn't depend on cron providerStefan Schulte2011-01-091-1/+12
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if cron is not installed the specs will throw errors abould not finding a default provider. Because the spec doesn't test provider features it shouldn't depend on any providers. Add stubs to let cron_spec work with no suitable provider
| * | | | | Merge branch 'ticket/2.6.next/maint-more-exec-testing' into 2.6.nextMax Martin2011-03-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-more-exec-testing: (#4884) Remove typo from spec test
| | * | | | | (#4884) Remove typo from spec testMax Martin2011-03-181-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the stubs was accidentally stubbing for /bin/foo instead of /bin/true. Reviewed-by:Nick Lewis
| * | | | | Merge branch 'ticket/2.6.next/maint-fix-exec-tests' into 2.6.nextMax Martin2011-03-182-75/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-fix-exec-tests: (#4884) Modify tests to pass on non-OS X systems