summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'ticket/2.6.x/6353' into 2.6.xPaul Berry2011-02-215-61/+145
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/6353: (#6353) Restore the ability to store paths in the filebucket
| | * | | | | | (#6353) Restore the ability to store paths in the filebucketPaul Berry2011-02-215-61/+145
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2274d5104f6e413a2b8899a3c3111a17bbb2f4d7 optimized network usage for the case where a file is already in the filebucket. However, it took away the ability to store paths. This change restores the ability to store paths while maintaining optimal network usage for the case where the file is already in the filebucket with the given path. This is expected to be the most common case. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | | Merge branch 'bug/2.6.x/6126-puppet-inspect-has-no-status-messages' into 2.6.xDaniel Pittman2011-02-182-58/+60
| |\ \ \ \ \ \
| | * | | | | | (#6126) Puppet inspect now reports status after run completes.Daniel Pittman2011-02-182-58/+60
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.xJacob Helwig2011-02-182-8/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6364-fix-mount-provider-on-aix: (#6364) Adjust mis-translated regex in mount provider for AIX
* | \ \ \ \ \ \ Merge branch 'tickets/2.6.x/6309-check-what-is-mounted' into 2.6.nextJacob Helwig2011-02-1810-135/+243
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6309-check-what-is-mounted: Remove pending tests from parsed mount provider (#6309) Ensure the correct device is mounted when managing mounts Clean up whitespace, and commented out code in parsed mount provider
| * | | | | | | | Remove pending tests from parsed mount providerJacob Helwig2011-02-181-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | | | | (#6309) Ensure the correct device is mounted when managing mountsJacob Helwig2011-02-189-118/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the mount type would only check if anything was mounted at the desired point, when 'ensure => mounted' was specified. Now we check not only whether something is mounted at the desired point, but also that it is the thing we wish to be mounted there. There is also a chance that the mount point directory could be "automagically" removed for us, when unmounting incorrect devices, so we attempt to re-create the directory after unmounting to give the mount of the correct device a better chance at succeeding. Paired-with: Matt Robinson <matt@puppetlabs.com> Paired-with: Nick Lewis <nick@puppetlabs.com> Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | | | | Clean up whitespace, and commented out code in parsed mount providerJacob Helwig2011-02-181-7/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* | | | | | | | Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.nextJacob Helwig2011-02-182-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6364-fix-mount-provider-on-aix: (#6364) Adjust mis-translated regex in mount provider for AIX
| * | | | | | | (#6364) Adjust mis-translated regex in mount provider for AIXJacob Helwig2011-02-182-8/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge branch 'ticket/2.6.next/6376-_search-support' into 2.6.nextMax Martin2011-02-182-2/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | (#6376) Add support and testing for _search GET requestsMax Martin2011-02-182-2/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for adding "_search" to the end of any indirection to 'pluralize' it, and added tests to check this functionality and to test hidden side effect of plurality method unpluralizing indirections. Paired-With:Paul Berry <paul@puppetlabs.com>
* | | | | | Merge branch 'bug/2.6.next/6337-parenthesize-arguments-for-future-versions' ↵Daniel Pittman2011-02-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 2.6.next
| * | | | | | (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"Daniel Pittman2011-02-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.8.6 (but not later versions) warn about requiring parenthesis on some function calls; having one of those in our network rights checking means that we emit ... quite a few of these, and annoy anything that tracks our logs. By using the more standard form of raise we can avoid the warning entirely, and keep consistent code style across the file. Reviewed-By: Paul Berry <paul@puppetlabs.com>
* | | | | | Merge branch 'ticket/2.6.next/6338' into 2.6.nextPaul Berry2011-02-1713-11/+362
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6338: (#5150) Make fact REST terminus configurable to connect to inventory service (#5166) Inventory service is now searchable by timestamp. Maint: backport timestamp accessor for facts from 2.7 branch Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding freshness check Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshness (#5132) Provide a query REST interface for inventory
| * | | | | (#5150) Make fact REST terminus configurable to connect to inventory serviceMatt Robinson2011-02-172-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet masters can now set the inventory_server and inventory_port option to point to another puppet master that will function as the central inventory service. When agents connect to the puppet master, this will send fact data from the puppet master over REST to the inventory service. The puppet master itself will still store the client fact data in the local yaml dir by setting the cache class to yaml. Getting puppet masters to talk to each other using certs is difficult. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | (#5166) Inventory service is now searchable by timestamp.Paul Berry2011-02-172-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to specify queries in the form “meta.timestamp.xx” where xx is eq,ne,gt,lt,ge,le when searching the inventory service.
| * | | | | Maint: backport timestamp accessor for facts from 2.7 branchPaul Berry2011-02-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding ↵Paul Berry2011-02-171-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | freshness check
| * | | | | Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshnessPaul Berry2011-02-171-17/+29
| | | | | |
| * | | | | (#5132) Provide a query REST interface for inventoryPaul Berry2011-02-1711-9/+210
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This REST interface returns a list of nodes that match a fact query. Fact queries can use (in)equality testing as a string comparison, and >, <, >=, <= numerical comparisons. Multiple tests can be done as AND comparisons, not OR. The fact queries need to be prefixed by facts, and the comparisons other than equality are specified with a .comparison_type after the fact name. This will be better explained in the REST documentation on the website. Searches that don't match anything now return empty array instead of a 404 error. Conflicts: spec/spec_helper.rb
* | | | | Merge branch 'ticket/2.6.next/5935' into 2.6.nextNick Lewis2011-02-173-962/+993
|\ \ \ \ \
| * | | | | (#5935) Allow functions to accept negated valuesNick Lewis2011-02-173-962/+993
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function(-1) was failing because the grammar wasn't allowing negated values in function calls. This fix makes the negation of any value which was previously legal as a function argument also now legal as a function argument. Paired-With: Max Martin Paired-With: Markus Roberts
* | | | | Merge branch 'ticket/2.6.next/6346-signal_int_trap' into 2.6.nextMatt Robinson2011-02-1614-28/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * ticket/2.6.next/6346-signal_int_trap: (#6346) Move the trap calls onto Signal so they're easier to stub
| * | | | (#6346) Move the trap calls onto Signal so they're easier to stubMatt Robinson2011-02-1614-28/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once you stub signal traps in tests, you can hit ctrl+c in the middle of a spec run and it will stop the run instead of puppet catching the SIGINT. I had trouble easily tracking down all the places to stub traps when the trap was being called as a private method on applications and daemons, but calling trap on Signal is equivalent since Kernel calls Signal.trap and Object mixes in Kernel to provide trap as a private method on all objects. A bigger solution would be to refactor everywhere we call trap into a method that's called consistently since right now we sprinkle SIGINT and SIGTERM trap handling over applications and daemons in inconsistent ways, returning different error codes and using different messages. I've captured this info in ticket #6345. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
* | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: Updated CHANGELOG for 2.6.5rc4 (#3646) Fix the documentation fix for `puppet apply --apply`
| * | | Updated CHANGELOG for 2.6.5rc4Jacob Helwig2011-02-141-0/+4
| | | |
| * | | Merge branch 'tickets/2.6.x/3646-fix-documentation-fix-fix' into 2.6.xJacob Helwig2011-02-142-6/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/3646-fix-documentation-fix-fix: (#3646) Fix the documentation fix for `puppet apply --apply`
| | * | | (#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>
* | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-8/+14
|\| | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: Updated CHANGELOG for 2.6.5rc3 Updated fix for #3646 - apply / compile documentation
| * | | Updated CHANGELOG for 2.6.5rc3Jacob Helwig2011-02-141-0/+5
| | | |
| * | | Updated fix for #3646 - apply / compile documentationJames Turnbull2011-02-142-8/+9
| | | |
* | | | Merge branch 'ticket/2.6.next/rspec_returns_1_when_failures' into 2.6.nextMatt Robinson2011-02-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/rspec_returns_1_when_failures: maint: make rspec exit with status 1 when there are failures
| * | | | maint: make rspec exit with status 1 when there are failuresMatt Robinson2011-02-141-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hudson wasn't notifying us when there was a test failure because fail_on_error was set to false. This appears to be because of a misconception that setting this to true caused the specs to run slower. That is not the case. Paired-with: Nick Lewis
* | | | Merge branch '2.6.x' into 2.6.nextMatt Robinson2011-02-140-0/+0
|\| | | | | | | | | | | | | | | | | | | * 2.6.x: (#5977) fix spec test failure when new applications are introduced.
| * | | (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here was previously fragile, in that it would break when new applications were introduced, and in that it depended on the order of items returned from reading the directories on disk. It is now insensitive to those changes, and still verifies that the results we require occur, reducing long term maintenance cost. Reviewed-by: James Turnbull <james@puppetlabs.com>
* | | | Merge branch 'bug/2.6.next/6269-hashes-only-work-with-two-levels' into 2.6.nextDaniel Pittman2011-02-123-393/+408
|\ \ \ \
| * | | | (Fixes #6269) merge changes from masterzen that resolve the issue.Daniel Pittman2011-02-123-393/+408
|/| | | | | | | | | | | | | | | | | | | parser.rb manually rebuilt to resolve global grammer chances.
| * | | | Fix #6269 - Hashes only work with two levels of accessBrice Figureau2011-02-123-800/+800
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manifest was failing: $hash = { 'a' => { 'b' => { 'c' => 'it works' } } } $out = $hash['a']['b']['c'] because of a typo in the grammar. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | Merge branch 'bug/2.6.next/5516-hashes-can't-be-used-in-selectors' into 2.6.nextDaniel Pittman2011-02-123-1786/+1871
|\ \ \ \
| * | | | (#5516) Rebuild parser.rb after merge.Daniel Pittman2011-02-121-1541/+1630
| | | | | | | | | | | | | | | | | | | | | | | | | The automatically generated parser.rb needed to be rebuilt to make the syntax changes functional; this commits only that rebuild.
| * | | | Merge branch 'masterzen/tickets/2.6.x/5516' into ↵Daniel Pittman2011-02-123-426/+422
|/| | | | | | | | | | | | | | | | | | | bug/2.6.next/5516-hashes-can't-be-used-in-selectors
| * | | | Fix #5516 - Hashes can't be used in selectorsBrice Figureau2011-02-123-426/+422
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manifest was producing a parse error: $int = { 'eth0' => 'bla' } $foo = $int['eth0'] ? { 'bla' => 'foo', default => 'bleh' } because selectors didn't support hash access. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here was previously fragile, in that it would break when new applications were introduced, and in that it depended on the order of items returned from reading the directories on disk. It is now insensitive to those changes, and still verifies that the results we require occur, reducing long term maintenance cost. Reviewed-by: James Turnbull <james@puppetlabs.com>
* | | | Merge branch 'bug/2.6.next/5720-puppetdoc-fails-on-parameterized-class' into ↵Daniel Pittman2011-02-127-12/+72
|\ \ \ \ | | | | | | | | | | | | | | | 2.6.next
| * | | | misc: ast_context has two arguments, not one.Daniel Pittman2011-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This updates the spec expectation to reflect that, eliminating a warning during the spec run.
| * | | | Merge branch 'masterzen/tickets/2.6/5720' into ↵Daniel Pittman2011-02-127-11/+71
|/| | | | | | | | | | | | | | | | | | | bug/2.6.next/5720-puppetdoc-fails-on-parameterized-class
| * | | | Fix #5720 - puppetdoc misses some class commentsBrice Figureau2011-02-114-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that the fix for #5252 wasn't complete, and class, nodes and definition were still using the current lexer line number instead of the line number of the class/define/node token. This combined with some missing comments stack pushing/pop on parenthesis prevented puppetdoc to correctly get the documentation of some class (including parametrized ones). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | Fix #6281 - Make sure puppetdoc analyzes all filesBrice Figureau2011-02-112-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen that when parsing a file puppet parses other manifests if they get imported (this is at least true for site.pp, even in ignoreimport=true). Thus those files are now "watched". But puppetdoc needs to analyze all files, and since 99c101 we are now checking if the file was already parsed to not reparse it again. If that was the case, though, we weren't analyzing the produced code. Thus it was possible to not produce documentation for the site.pp content. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>