summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | (#5944) Improve documentation of defined() functionnfagerlund2011-01-251-6/+41
| |/ / / / / | | | | | | | | | | | | | | | | | | The differences in the way defined() handles different types of entities weren't well-explained. Documentation was also added for the behavior of defined(Node["somenode.domain.com"]).
| * | | | | Merge branch 'ticket/2.6.next/5594' into 2.6.nextnfagerlund2011-01-251-32/+2
| |\ \ \ \ \
| | * | | | | (#5594) Update documentation of exec resource type.nfagerlund2011-01-251-32/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The exec resource doc referred to duplicate names being allowed, which stopped being true in 0.24.2. Reviewed by Matt Robinson.
| * | | | | | Merge branch 'ticket/2.6.next/5931' into 2.6.nextPaul Berry2011-01-2531-118/+113
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5931: (#5931) Prevent errors when calling insync? on audited properties Maint: Removed dead code from resource harness. Maint: Rename misleading insync? method in file provider
| | * | | | | (#5931) Prevent errors when calling insync? on audited propertiesPaul Berry2011-01-2530-97/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a method safe_insync? which first checks whether the property has a "should" value of nil, and if so returns true. Most insync? methods were already doing this, but a few were not, leading to bugs if a property was being audited but not set. Types should continue to override the insync? method, but callers of insync? should call safe_insync? instead. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | * | | | | Maint: Removed dead code from resource harness.Paul Berry2011-01-251-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | * | | | | Maint: Rename misleading insync? method in file providerPaul Berry2011-01-253-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method actually checks whether the file owner is in sync. Renamed to is_owner_insync? Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.6.next/5548' into 2.6.nextnfagerlund2011-01-251-4/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (#5548) Specify return values of manual status commands in service type ↵nfagerlund2011-01-251-4/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | description. Reviewed by Matt Robinson.
* | / / / Merge branch '2.6.next' into 2.6.xMatt Robinson2011-01-1929-744/+879
|\| | | | | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (21 commits) (#5900) Include ResourceStatus#failed in serialized reports (#5882) Added error-handling for bucketing files in puppet inspect (#5882) Added error-handling to puppet inspect when auditing (#5171) Made "puppet inspect" upload audited files to a file bucket Prep for #5171: Added a missing require to inspect application. Locked Puppet license to GPLv2 (#5838) Support paths as part of file bucket requests. (#5838) Improve the quality of file bucket specs. (#5838) Make file bucket dipper efficient when saving a file that already exists (#5838) Implemented the "head" method for FileBucketFile::File terminus. (#5838) Reworked file dipper spec to perform less stubbing. (#5838) Added support for HEAD requests to the indirector. (#5838) Refactored error handling logic into find_in_cache. (#5838) Refactored Puppet::Network::Rights#fail_on_deny maint: Remove unused Rakefile in spec directory (#5171) Made filebucket able to perform diffs (#5710) Removed unnecessary calls to insync? Prep for fixing #5710: Refactor stub provider in resource harness spec Maint: test partial resource failure maint: Inspect reports should have audited = true on events ...
| * | | Merge branch 'ticket/2.6.next/5900' into 2.6.nextNick Lewis2011-01-141-1/+2
| |\ \ \
| | * | | (#5900) Include ResourceStatus#failed in serialized reportsNick Lewis2011-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property was excluded from serialization because it was believed that its value could be determined by looking at the events of a ResourceStatus. However, if a resource can't be retrieved, it will have no events created, and will have no other way of determining its status. Reviewed-By: Paul Berry
| * | | | Merge remote branch 'jamtur01/tickets/2.6.x/5875' into 2.6.nextPaul Berry2011-01-141-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * jamtur01/tickets/2.6.x/5875: Locked Puppet license to GPLv2
| | * | | Locked Puppet license to GPLv2James Turnbull2011-01-131-2/+2
| |/ / / |/| | |
* | | | Merge branch 'ticket/2.6.next/5799' into 2.6.xNick Lewis2011-01-072-19/+32
|\ \ \ \
* \ \ \ \ Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.xMatt Robinson2011-01-062-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/remove_rspec_options_from_rakefile: maint: Add vim swap files to .gitignore maint: Remove rspec options from the Rakefile
* \ \ \ \ \ Merge branch '2.6.next' into 2.6.xNick Lewis2011-01-05103-1261/+958
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '2.6.next' into 2.6.xMatt Robinson2010-12-1616-12/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: maint: Fix ActiveRecord confine issue maint: Fix a test that was missing a require maint: Fix tests that don't run on their own
* \ \ \ \ \ \ \ Merge branch '2.6.next' into 2.6.xNick Lewis2010-12-1633-256/+507
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| | | | | | * | Merge branch 'ticket/2.6.next/5882' into 2.6.nextNick Lewis2011-01-132-15/+106
| | | | | | |\ \
| | | | | | | * | (#5882) Added error-handling for bucketing files in puppet inspectNick Lewis2011-01-132-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-With: Paul Berry
| | | | | | | * | (#5882) Added error-handling to puppet inspect when auditingNick Lewis2011-01-132-13/+86
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If auditing a resource fails, the report will contain failure events for every audited property of the resource. The report itself will also be marked as "failed". Paired-With: Paul Berry
| | | | | | * | Merge branch 'ticket/2.6.next/5171-upload-files-during-inspect' into 2.6.nextPaul Berry2011-01-133-0/+101
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5171-upload-files-during-inspect: (#5171) Made "puppet inspect" upload audited files to a file bucket Prep for #5171: Added a missing require to inspect application.
| | | | | | | * | (#5171) Made "puppet inspect" upload audited files to a file bucketPaul Berry2011-01-133-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only occurs if the new setting :archive_files is set. Another new setting, :archive_file_server, can be used to specify the server that files should be uploaded to. Paired-with: Nick Lewis <nick@puppetlabs.com>
| | | | | | | * | Prep for #5171: Added a missing require to inspect application.Paul Berry2011-01-131-0/+1
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Nick Lewis <nick@puppetlabs.com>
| | | | | | * | Merge branch 'ticket/2.6.next/5838' into 2.6.nextPaul Berry2011-01-1221-650/+505
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5838: (#5838) Support paths as part of file bucket requests. (#5838) Improve the quality of file bucket specs. (#5838) Make file bucket dipper efficient when saving a file that already exists (#5838) Implemented the "head" method for FileBucketFile::File terminus. (#5838) Reworked file dipper spec to perform less stubbing. (#5838) Added support for HEAD requests to the indirector. (#5838) Refactored error handling logic into find_in_cache. (#5838) Refactored Puppet::Network::Rights#fail_on_deny
| | | | | | | * | (#5838) Support paths as part of file bucket requests.Paul Berry2011-01-122-85/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In versions of Puppet 2.6.0-2.6.4, file bucket requests are of the form md5/<checksum>/<path>. The path functionality has been removed, however we still need to support requests coming from older clients. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Improve the quality of file bucket specs.Paul Berry2011-01-122-36/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Make file bucket dipper efficient when saving a file that already existsPaul Berry2011-01-122-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before saving to the file bucket, the file bucket dipper now checks to make sure that no file with the given checksum is already present. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Implemented the "head" method for FileBucketFile::File terminus.Paul Berry2011-01-126-445/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to do this it was necessary to refactor FileBucketFile to untangle responsibilities for computing paths, reading files, etc. In the process, removed speculative generalizations and unused functionality. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Reworked file dipper spec to perform less stubbing.Paul Berry2011-01-121-82/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for adding more functionality to the file dipper. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Added support for HEAD requests to the indirector.Paul Berry2011-01-1215-21/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability for the indirector to handle REST HEAD requests. These are done using a new indirector method, head(), which should return true if find() would return a result and false if find() would return nil. Access control for the head method is the union of that for the find and save methods. That is, if either find or save is allowed, then head is allowed. This is necessary so that users will not have to change their authconfig to take advantage of the new feature. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Refactored error handling logic into find_in_cache.Paul Berry2011-01-121-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the error handling logic surrounding the call to Puppet::Indirector::Indirection#find_in_cache() into the find_in_cache() method itself, so that won't need to be duplicated when find_in_cache() is called from elsewhere. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | (#5838) Refactored Puppet::Network::Rights#fail_on_denyPaul Berry2011-01-124-47/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed into a method that returns the exception to raised rather than raising it. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | * | | Merge branch 'maint/2.6.next/remove_unused_rakefile' into 2.6.nextMatt Robinson2011-01-111-91/+0
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | * maint/2.6.next/remove_unused_rakefile: maint: Remove unused Rakefile in spec directory
| | | | | | | * | maint: Remove unused Rakefile in spec directoryMatt Robinson2011-01-111-91/+0
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rakefile just created rake tasks so that you could run all the specs in a subdirectory. However, rspec already allows you to just give the subdirectory as an argument and does the same thing, so these rake tasks were unecessary.
| | | | | | * | Merge branch 'ticket/2.6.next/5171-filebucket-diff' into 2.6.nextPaul Berry2011-01-115-3/+67
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5171-filebucket-diff: (#5171) Made filebucket able to perform diffs
| | | | | | | * | (#5171) Made filebucket able to perform diffsJesse Wolfe2011-01-115-3/+67
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to ask the filebucket to diff two files using a URL of the form: https://puppet/production/file_bucket_file/md5/{first file hash}?diff_with={second file hash} The returned diff is a string, the output of the "diff" command. Paired-with: Paul Berry <paul@puppetlabs.com>
| | | | | | * | Merge branch 'ticket/2.6.next/5710' into 2.6.nextPaul Berry2011-01-072-35/+64
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5710: (#5710) Removed unnecessary calls to insync? Prep for fixing #5710: Refactor stub provider in resource harness spec
| | | | | | | * | (#5710) Removed unnecessary calls to insync?Paul Berry2011-01-072-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the resource harness, we were calling insync? on all properties of a resource, even if those properties weren't being managed. This was unsafe. Changed to only call insync? on properties that are mentioned in the manifest. In addition, we discovered that the resource harness's computation of desired_values was incorrect, and was consulting the current system state rather than the desired state. Since this hash was (erroneously) only being consulted to see if it included :ensure, this didn't cause any obvious bugs. However it is now fixed. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | | * | Prep for fixing #5710: Refactor stub provider in resource harness specPaul Berry2011-01-071-33/+36
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the stub provider to its own method so that it can be re-used in additional spec tests. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | * | Merge branch 'maint/2.6.next/test_partial_resource_failure' into 2.6.nextPaul Berry2011-01-071-0/+58
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/test_partial_resource_failure: Maint: test partial resource failure
| | | | | | | * | Maint: test partial resource failurePaul Berry2011-01-071-0/+58
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a resource harness test to verify that the correct events are generated if there is a failure while synchronizing a resource. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | | | * | Merge branch 'ticket/2.6.next/5799' into 2.6.nextNick Lewis2011-01-072-19/+32
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | (#5799) Simplify report dir creationNick Lewis2011-01-062-19/+32
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This report processor was unnecessarily using Puppet to create a single directory. This was causing complex failures in any spec dealing with reports. Paired-With: Paul Berry
| | | | | * | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.nextMatt Robinson2011-01-062-1/+3
| | | | | |\ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/remove_rspec_options_from_rakefile: maint: Add vim swap files to .gitignore maint: Remove rspec options from the Rakefile
| | | | * | | maint: Add vim swap files to .gitignoreMatt Robinson2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe
| | | | * | | maint: Remove rspec options from the RakefileMatt Robinson2011-01-062-1/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the Rakefile set RSpec options made it so that the .rspec (spec.opts in RSpec < 2) file for personal RSpec preferences was ignored. It also caused the ci_reporter RSpec options to be ignored which meant that Hudson couldn't get consumable output from our spec runs. It's also about time Puppet had a project level .gitignore file so that if people want personal rspec preferences (color or a different print format for example) in a .rspec file, those changes don't actually get checked in. Paired-with: Jesse Wolfe
| | | | * | Merge branch 'maint/2.6.next/inspect_audited_should_be_true' into 2.6.nextMatt Robinson2011-01-062-1/+27
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/inspect_audited_should_be_true: maint: Inspect reports should have audited = true on events
| | | | | * | maint: Inspect reports should have audited = true on eventsMatt Robinson2011-01-062-1/+27
| | | | |/ / | | | |/| | | | | | | | | | | | | | Paired-with: Jesse Wolfe