summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/2.6.next/maint-cleanup_spec_output' into 2.6.nextMatt Robinson2011-03-085-5/+8
|\ | | | | | | | | * ticket/2.6.next/maint-cleanup_spec_output: maint: Remove spec run noise
| * maint: Remove spec run noiseMatt Robinson2011-03-085-5/+8
|/ | | | | | | | | | | | | | | | | | | | | There were some warnings and stack traces in the spec output that aren't necessary. The only interesting fix is of the message: lib/puppet/module.rb:79 warning: multiple values for a block parameter (0 for 1) from lib/puppet/util/logging.rb:30 If you call any form of logging on a module you end calling the file method on the module just because logging always checks for that method and calls it if it's defined, but in this case it's not defined in the way that logging expected so passes the wrong paramters. The easy solution is just to call logging on Puppet, which makes sense in this case anyway, and I don't think it's worth a separate ticket to deal with that logging warning. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
* Merge branch 'ticket/2.6.next/6338' into 2.6.nextNick Lewis2011-03-086-0/+363
|\
| * (#6338) Support searching on metadata in InventoryActiveRecord terminusNick Lewis2011-03-082-41/+90
| | | | | | | | | | | | | | Timestamps are currently the only supported metadata for searching. Paired-With: Max Martin Reviewed-By: Jacob Helwig
| * (#6338) Implement search for InventoryActiveRecord facts terminusNick Lewis2011-03-083-0/+112
| | | | | | | | | | Paired-With: Max Martin Reviewed-By: Jacob Helwig
| * (#6338) Add an InventoryActiveRecord terminus for FactsNick Lewis2011-03-086-0/+202
| | | | | | | | | | | | | | | | So far this terminus only supports find and save. Search is forthcoming. It uses two new tables (inventory_host and inventory_facts) so that it won't interact with storedconfigs. Paired-With: Jacob Helwig
* | Merge branch 'maint/2.6.next/test_mount' into 2.6.nextMax Martin2011-03-081-35/+64
|\ \ | | | | | | | | | | | | * maint/2.6.next/test_mount: Added integration tests for the mount provider
| * | Added integration tests for the mount providerPaul Berry2011-03-081-35/+64
| | | | | | | | | | | | Paired-with: Max Martin <max@puppetlabs.com>
* | | Merge branch 'tickets/2.6.next/5794-create-report-parentdir' of ↵Jacob Helwig2011-03-082-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/vvitayaudom/puppet into 2.6.next * 'tickets/2.6.next/5794-create-report-parentdir' of git://github.com/vvitayaudom/puppet: (#5794) create reports directory when creating host specific directory
| * | | (#5794) create reports directory when creating host specific directoryValdis Victor Vitayaudom2011-03-052-2/+5
| | | |
* | | | Merge branch 'ticket/2.6.x/6513-propigate-environment-in-settings-values' ↵Jacob Helwig2011-03-082-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 2.6.next * ticket/2.6.x/6513-propigate-environment-in-settings-values: (#6513) Propagate the environment when doing variable lookup in settings (#6513) Adjust P::U::Settings test name to reflect what it tests
| * | | | (#6513) Propagate the environment when doing variable lookup in settingsJacob Helwig2011-03-082-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example with the following: test.conf: [master] rrddir = /var/lib/puppet/rrd templatedir = /var/lib/puppet/templates [env_a] templatedir = $rrddir/templates rrddir = /tmp/env_a/ The command: RUBYLIB=lib bin/puppet master --config ./test.conf --environment env_a --configprint templatedir originally produced '/var/lib/puppet/rrd/templates' instead of the expected '/tmp/env_a/templates' Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | (#6513) Adjust P::U::Settings test name to reflect what it testsJacob Helwig2011-03-081-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'should interpolate found values using the current environment' wasn't actually testing what it was describing, since the environment variable is special cased. Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
* | | | Merge branch 'ticket/2.6.next/5724-deprecate_DESTDIR_for_install.rb' of ↵Jacob Helwig2011-03-081-25/+20
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | git://github.com/elutfall/puppet into 2.6.next * 'ticket/2.6.next/5724-deprecate_DESTDIR_for_install.rb' of git://github.com/elutfall/puppet: (5724) Prep for deprecation of DESTDIR Refactoring duplicate code and logic in prep for DESTDIR deprecation.
| * | | (5724) Prep for deprecation of DESTDIRElias Lutfallah2011-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | In preparation of deprecating the DESTDIR env variable, I've added a warning when the DESTDIR variable is being used.
| * | | Refactoring duplicate code and logic in prep for DESTDIR deprecation.Elias Lutfallah2011-03-051-25/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESTDIR is slated to be deprecated. The block of code that checks for DESTDIR contained duplicate code as the block that checks for --destdir. The dupe code has been moved out of the destdir checks. I have also flipped the order of checking. Previously, if the DESTDIR env was set it would be used regardless of whether or not the --destdir flag was set. No env, no flag: ./install.rb destdir = nil Env only: DESTDIR="foo" ./install.rb destdir = foo Flag only: ./install.rb --destdir="bar" destdir = bar Both (uses flag): DESTDIR="foo" ./install.rb --destdir="bar" destdir = bar
* | | Merge branch 'ticket/2.6.next/6632' into 2.6.nextPaul Berry2011-03-084-32/+14
|\ \ \ | | | | | | | | | | | | | | | | * ticket/2.6.next/6632: (#6632) Adding a new mount no longer causes error with umount
| * | | (#6632) Adding a new mount no longer causes error with umountPaul Berry2011-03-084-32/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two problems: * In lib/puppet/type/mount.rb, we were calling provider.mounted? to determine whether we needed to execute "mount" after updating the in-memory fstab record. This wasn't working properly because provider.mounted? makes its decision based on the data stored in the in-memory fstab record. Since the fstab record had just been updated, provider.mounted? was incorrectly returning true even though the device wasn't actually mounted. Fixed this by checking provider.mounted? before updating the in-memory fstab record. * Calling mount from this point in lib/puppet/type/mount.rb is actually too early, because even though the in-memory fstab record has been created, its contents have not been written to `/etc/fstab` yet. Fixed this by storing a :needs_mount entry in the property_hash and checking it at the end of the flush() method. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
* | | Adjust Darwin mount provider tests to pass on LinuxPaul Berry2011-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | mount, and umount are located under /bin, instead of /sbin on Linux, so we adjust the ExecutionStub to accept either location. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
* | | Merge branch 'maint/2.6.next/test_mount' into 2.6.nextPaul Berry2011-03-071-0/+93
|\ \ \ | | | | | | | | | | | | | | | | * maint/2.6.next/test_mount: Maint: Begin adding integration tests for the mount provider
| * | | Maint: Begin adding integration tests for the mount providerPaul Berry2011-03-071-0/+93
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests form a starting point for integration testing the mount provider, using the new Puppet::Util::ExecutionStub mechanism to simulate the state of the machine in response to the execution of "mount" and "umount" commands. The tests currently work around some known bugs (6628, 6632, and 6633). Reviewed-by: Max Martin <max@puppetlabs.com>
* | | Merge branch 'maint/2.6.next/make_execute_stubbable' into 2.6.nextPaul Berry2011-03-074-0/+67
|\ \ \ | |/ / |/| | | | | | | | * maint/2.6.next/make_execute_stubbable: Maint: Added the ability to replace the behavior of Puppet::Util.execute with an arbitrary code block for ease in spec testing.
| * | Maint: Added the ability to replace the behavior ofPaul Berry2011-03-074-0/+67
|/ / | | | | | | | | | | | | Puppet::Util.execute with an arbitrary code block for ease in spec testing. Reviewed-by: Max Martin <max@puppetlabs.com>
* | Merge branch 'ticket/2.6.next/6606' into 2.6.nextnfagerlund2011-03-0411-11/+41
|\ \ | |/ |/|
| * (#6606) Inline docs: Document all autorequire relationshipsnfagerlund2011-03-0411-11/+41
|/ | | | This patch appends **Autorequires:** notes to the @doc string of every type whose instances can autorequire other resources. This will put autorequire info right on the types reference where it can do the most good.
* Merge branch 'ticket/2.6.next/6602' into 2.6.nextNick Lewis2011-03-041-1/+1
|\
| * (#5148) Fix failing spec due to timezoneNick Lewis2011-03-041-1/+1
| | | | | | | | | | | | | | Time.parse(...) will yield a string in the local timezone. So when this spec was run in a non -0700 timezone, it was failing, because it was comparing a string in local time to a string in -0700. This fixes it to compare to the local string representation of the time.
* | Merge branch 'ticket/2.6.next/6602' into 2.6.nextNick Lewis2011-03-042-0/+45
|\|
| * (#5148) Add support for PSON to factsNick Lewis2011-03-042-0/+45
|/ | | | | | | Previously, facts could be fetched via the REST API in PSON, but came back as the to_s representation of a Ruby object, rather than as proper PSON data. This patch adds to_pson and from_pson to facts, so they can be properly used with PSON.
* Merge branch 'ticket/2.6.next/6581' into 2.6.nextNick Lewis2011-03-036-310/+289
|\
| * (#6338) Remove inventory indirection, and move to facts indirectionNick Lewis2011-03-036-310/+289
| | | | | | | | | | | | | | | | The inventory indirection was just providing the search method for facts. Because the route is now facts_search instead of inventory, it can just be implemented as the search method for facts. Reviewed-By: Daniel Pittman
* | Merge branch 'ticket/2.6.next/6445' into 2.6.nextnfagerlund2011-03-031-1/+1
|\ \ | |/ |/|
| * (#6445) Fix inline docs: puppet agent does not accept --mkusersBen Hughes2011-03-031-1/+1
|/ | | | | Inline documentation in lib/puppet/reference/configuration.rb stated that puppet agent accepted the --mkusers flag, which is only intended for use with puppet master.
* Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-022-1/+6
|\ | | | | | | | | | | | | * 2.6.x: Update CHANGELOG and version for 2.6.6rc1 (#6541) Fix content with checksum truncation bug (#6418) Recursive files shouldn't be audited
| * Update CHANGELOG and version for 2.6.6rc1Jacob Helwig2011-03-022-1/+6
| |
| * (#6541) Fix content with checksum truncation bugMatt Robinson2011-03-022-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch for #6107 fd73874147a1aaa3a047f904a0bc1ae67780a2e4 introduced a bug when content was an invalid checksum. Rather than error the checksum was invalid, it would overwrite the file with empty string, essentially truncating it. The problem with #6107 is that when I wrote it, I didn't realize that the content parameter was munged to be nil when it was a checksum, and then chunking method special cased nil content to mean you should check the filebucket. #6107 intended to fix the case where content REALLY WAS nil, and handle that by returning an empty string. This patch fixes it so that we check to see if we really passed in a checksum when chunking, and only then going to the filebucket. Surprisingly it is possible to have a content checksum should value set from source, so we have to be careful not to assume the use of the filebucket whenever there's a checksum. The following manifest produces this situation: file { "/tmp/mydir" : source => '/tmp/sourcedir', recurse => true, } I've said it before, and sure I'll say it again, but long term the file provider really needs a refactor. I'll write some acceptance tests for file behavior right after committing this so that the refactoring will be easier. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
| * (#6418) Recursive files shouldn't be auditedJesse Wolfe2011-03-021-14/+0
| | | | | | | | | | | | | | | | | | | | | | A vestigial codepath was accidentally made live again when 2.6.0's audit parameter was added. This patch removes that code. As it's very difficult to write a meaningful unit test of a negative case, a test will be added to the acceptance test project to confirm before & after behavior for this fix. Reviewed-By: Markus Roberts <markus@puppetlabs.com>
* | Merge branch 'ticket/2.6.next/6541-md5_in_content_truncates' into 2.6.nextMatt Robinson2011-03-023-33/+63
|\ \ | | | | | | | | | | | | | | | * ticket/2.6.next/6541-md5_in_content_truncates: (#6541) maint: whitespace cleanup on the file integration spec (#6541) Fix content with checksum truncation bug
| * | (#6541) maint: whitespace cleanup on the file integration specMatt Robinson2011-03-021-29/+32
| | |
| * | (#6541) Fix content with checksum truncation bugMatt Robinson2011-03-022-4/+31
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch for #6107 fd73874147a1aaa3a047f904a0bc1ae67780a2e4 introduced a bug when content was an invalid checksum. Rather than error the checksum was invalid, it would overwrite the file with empty string, essentially truncating it. The problem with #6107 is that when I wrote it, I didn't realize that the content parameter was munged to be nil when it was a checksum, and then chunking method special cased nil content to mean you should check the filebucket. #6107 intended to fix the case where content REALLY WAS nil, and handle that by returning an empty string. This patch fixes it so that we check to see if we really passed in a checksum when chunking, and only then going to the filebucket. Surprisingly it is possible to have a content checksum should value set from source, so we have to be careful not to assume the use of the filebucket whenever there's a checksum. The following manifest produces this situation: file { "/tmp/mydir" : source => '/tmp/sourcedir', recurse => true, } I've said it before, and sure I'll say it again, but long term the file provider really needs a refactor. I'll write some acceptance tests for file behavior right after committing this so that the refactoring will be easier. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* | Merge branch '2.6.x' into 2.6.nextNigel Kersten2011-02-281-15/+14
|\|
| * Update CHANGELOG for 2.6.5Nigel Kersten2011-02-281-15/+14
| |
* | Merge branch 'ticket/2.6.next/5466' into 2.6.nextMatt Robinson2011-02-283-22/+40
|\ \ | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5466: (#5466) Write specs for output of puppet resource (#5466) Monkey patch Symbol so that you can sort them (#5466) Fixed puppet resource bug with trailing ,
| * | (#5466) Write specs for output of puppet resourceMatt Robinson2011-02-281-13/+17
| | | | | | | | | | | | Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | (#5466) Monkey patch Symbol so that you can sort themMatt Robinson2011-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that the ability to sort symbols comes in the preinit section of application run when we load Facter and hit the code that adds the <=> method for symbols in lib/facter/util/plist/generator.rb Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | (#5466) Fixed puppet resource bug with trailing ,Nan Liu2011-02-281-9/+20
|/ /
* | Merge branch 'maint/2.6.next/revert-5935' into 2.6.nextNick Lewis2011-02-283-993/+962
|\ \
| * | Revert "(#5935) Allow functions to accept negated values"Nick Lewis2011-02-213-993/+962
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e3c59df2b246fe5e764272f21b631a5d2f28687f. This commit is being reverted because the solution is incomplete, and a better solution is out of scope for this release. A more complete solution will be implemented in the future.
* | | Merge branch 'ticket/2.6.next/4922' into 2.6.nextNick Lewis2011-02-282-138/+38
|\ \ \
| * | | (#4922) Don't truncate remotely-sourced files on 404Nick Lewis2011-02-282-138/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were 'handling' 404's on remote file content retrieval by returning nil rather than raising an exception. This caused no content to be written to the temporary file, but still appeared successful, so the destination file was overwritten, instead of preserved. Now we just handle 404 like any other error. Note that the root cause of these 404s seems to have been #4319, which has been fixed. However, in the event we do happen to get a 404 here, it's better not to have code to specifically handle it incorrectly. Paired-With: Max Martin Reviewed-By: Matt Robinson
generated by cgit (git 2.34.1) at 2025-09-25 21:09:43 +0000