summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | (#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
| | * | | | | (#4884) Modify tests to pass on non-OS X systemsMax Martin2011-03-182-75/+82
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problems with the spec tests for the new exec type and providers that were causing failures on non-OS X systems. This involved rearranging some of the tests and their describe blocks, which makes the diff look more dramatic than it really is. Paired-with:Matt Robinson, Jacob Helwig
| * | | | | Merge branch ↵Max Martin2011-03-1715-434/+1279
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered-bash-code' into 2.6.next * feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered-bash-code: (#4884) Revise new exec tests, add a few more (#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 (#4884) Get rid of open3 require since it wasn't being used
| * | | | | (#4884) Revise new exec tests, add a few moreMax Martin2011-03-173-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revised a few of the new tests for the exec type and provider to ensure that they were testing what they meant to, and added in a couple of new tests. Reviewed-by:Daniel Pittman
| * | | | | (#4884) Add an shell provider for execsMatt Robinson2011-03-152-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to use shell builtins when the exec is inline bash commands. Paired-with: Max Martin
| * | | | | (#4884) Fix Test::Unit exec testsMatt Robinson2011-03-151-176/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly this is whitespace cleanup, but other than that it's changing a couple method names and calling run on the new exec providers instead of the types. We started moving these tests into spec, but they weren't very self contained so were hard to map over cleanly. For now leaving them since they serve as a more integration level set of tests. Paired-with: Max Martin
| * | | | | (#4884) Break the exec type out to have a posix providerDaniel Pittman2011-03-154-239/+841
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for allowing other new providers to handle exec commands differently. Reviewed-by: Max Martin and Matt Robinson
| * | | | | (#4884) Add consistent path validation and behaviorDaniel Pittman2011-03-154-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many path parameters were implementing their own inconsistent validation and behavior. Now those parameters can have a parent class that makes things a lot more consistent. Reviewed-by: Matt Robinson and Max Martin
| * | | | | (#4884) Add expand_path to requiring the spec_helperMatt Robinson2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Max Martin
| * | | | | (#4884) Autorequire shared behaviors and method to silence warningsDaniel Pittman2011-03-152-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with_verbose_disabled allows you to run tests that muck with constans without getting spammy warnings. Reviewed-by: Max Martin and Matt Robinson
| * | | | | (#4884) Fix whitespaceMatt Robinson2011-03-151-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Max Martin
| * | | | | (#4884) Get rid of open3 require since it wasn't being usedMatt Robinson2011-03-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Max Martin
* | | | | | Updated CHANGELOG for 2.6.7rc1Matt Robinson2011-03-162-2/+107
| | | | | |
* | | | | | Merge branch '2.6.next' into 2.6.xMatt Robinson2011-03-16137-2825/+4454
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (102 commits) (#5073) Download plugins even if you're filtering on tags Fix #5610: Prevent unnecessary RAL lookups Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next" (#6723) Fix withenv environment restoration bug (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord Remove extra trailing whitespace from lib/puppet/resource.rb (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs (#6707) Fix typo in rest_authconfig.rb (#6689) Make inventory_active_record terminus search quickly (#5392) Give a better error when realizing a non-existant resource (#2645) Adding a less-stubby test to verify the "system" attribute's behavior maint: Remove serialization of InventoryFact values maint: Rename InventoryHost to InventoryNode Fixed #2645 - Added support for creating system users maint: Remove spec run noise maint:Refactor of mount provider integration tests (#6338) Support searching on metadata in InventoryActiveRecord terminus (#6338) Implement search for InventoryActiveRecord facts terminus (#6338) Add an InventoryActiveRecord terminus for Facts Added integration tests for the mount provider ...
| * | | | | Merge branch 'ticket/2.6.next/5073' into 2.6.nextMatt Robinson2011-03-163-11/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5073: (#5073) Download plugins even if you're filtering on tags
| | * | | | | (#5073) Download plugins even if you're filtering on tagsMatt Robinson2011-03-153-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we eval a resource in transaction.rb it was being skipped when filtering on tags and downloading the plugins. There's a lot of complicated conditions for whether to skip a resource, but this is a condensed version of the path that was causing plugins not to be downloaded. skip? missing_tags? !ignore_tags? !host_config The Puppet::Configurer::Downloader creates separate catalogs and applies them to get custom facts and plugins, so should be setting host_config to false. Puppet::Util::Settings also sets host_config to false when you call use on settings, while normal catalog application defaults to true. Thanks to Stefan Schulte <stefan.schulte@taunusstein.net> for suggesting the implementation fix.
| * | | | | | Merge branch 'ticket/2.6.next/5610' into 2.6.nextJesse Wolfe2011-03-152-2/+13
| |\ \ \ \ \ \
| | * | | | | | Fix #5610: Prevent unnecessary RAL lookupsJesse Wolfe2011-03-152-2/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Paul Berry <paul@puppetlabs.com>
| * | | | | | Revert "Merge branch 'ticket/2.6.x/5605' of ↵Jesse Wolfe2011-03-154-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/stschulte/puppet into 2.6.next" This reverts commit 658bdb72bee3ad664627a71793213e6540afd5cb, reversing changes made to 4c9bd43bc2f5fde9d86196e8689dced929d39aad. See comment at http://projects.puppetlabs.com/issues/5605#note-9
| * | | | | | Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into ↵Jesse Wolfe2011-03-154-6/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | | | (#5605) Prefetch doesnt work with composite keysStefan Schulte2010-12-234-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uniqueness_key method of a type or resource object should return a key that can be used to identify this resource. In fact puppet seldomly uses this method and instead uses resource[:name] as an identifier. While this is totally fine for resourcetypes with a single key_attribute (and resource[:name] returning the namevar), it breaks things as soon as one creates a type with a composite key (prefetching for example is broken). To ease the process of replacing calls to resource[:name] to resource.uniqueness_key, the method uniqueness_key now just returns name_var if there is only one key_attribute (immitating self[:name]) and only returns an array of all the values of all the key_attributes if we have more than one key_attribute. The resourcehash which is passed to providers in their prefetch method is now build with uniqueness_key as the hashkey. Because of the new behaviour of uniqueness_key we hopefully wont break existing providers while allowing new providers for types with composite keys to implement correct prefetch methods.
| * | | | | | | Merge branch 'ticket/2.6.next/6723-withenv-bug' into 2.6.nextMax Martin2011-03-152-5/+53
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6723-withenv-bug: (#6723) Fix withenv environment restoration bug
| | * | | | | | | (#6723) Fix withenv environment restoration bugMax Martin2011-03-152-5/+53
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensured that withenv properly restores the environment after it runs a block and added testing for the method. Reviewed-by: Matt Robinson and Daniel Pittman
| * | | | | | | Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.nextMax Martin2011-03-1511-49/+67
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '2.6.next' of github.com:puppetlabs/puppet: (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord Remove extra trailing whitespace from lib/puppet/resource.rb (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs (#6707) Fix typo in rest_authconfig.rb (#6689) Make inventory_active_record terminus search quickly (#5662) Fixed tests that didnt stub key_attributes (#5662) Parsedfile doesnt work with mult keyattr (#5661) Creating types dont work with >1 namevar
| | * | | | | | Merge branch 'ticket/2.6.next/5428-handle-0.25.x-storedconfig-data' into ↵Jacob Helwig2011-03-152-18/+43
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * ticket/2.6.next/5428-handle-0.25.x-storedconfig-data: Remove extra trailing whitespace from lib/puppet/resource.rb (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs Conflicts: lib/puppet/resource.rb
| | | * | | | | | Remove extra trailing whitespace from lib/puppet/resource.rbJacob Helwig2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Daniel Pittman <daniel@puppetlabs.com>
| | | * | | | | | (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigsJacob Helwig2011-03-152-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Puppet::Resource::Reference class wasn't stubbing enough of the 0.25.x behavior to satisfy the needs of storedconfigs. Since P::R::Reference, and Puppet::Resource were merged as part of 2.6.x, we can pretend that P::Resource is P::R::Reference for the purposes of loading data from storedconfigs. This should still satisfy the over-the-wire serialization needs of 0.25.x. This also changes internal references to @parameters in Puppet::Resource(::Reference) to go through a parameters method. This allows us to "initialize" this instance variable lazily, since loading via YAML bypasses the normal initialize method. Paired-with: Daniel Pittman <daniel@puppetlabs.com> Reviewed-by: Markus Roberts <markus@puppetlabs.com>
| | * | | | | | | Merge branch 'ticket/2.6.next/6689' into 2.6.nextNick Lewis2011-03-151-1/+0
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecordNick Lewis2011-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added while developing in order to benchmark, but wasn't removed before committing. Reviewed-By: Jacob Helwig
| | * | | | | | | Merge branch 'ticket/2.6.x/5662' of https://github.com/stschulte/puppet into ↵Jesse Wolfe2011-03-142-1/+4
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next Manually Resolved Conflicts: spec/unit/provider/mount/parsed_spec.rb
| | | * | | | | | | (#5662) Fixed tests that didnt stub key_attributesStefan Schulte2010-12-232-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parsedfile provider calls the method key_attributes of the resource class to decide what resourceparameters must be put in the property_hash. Tests that uses fake resources and only stub resource[:name] must also stub resource.class.key_attributes