summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* (#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.
* 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
| | | * | | | (#5662) Parsedfile doesnt work with mult keyattrStefan Schulte2010-12-231-1/+3
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one wants to use the parsedfile provider for a type with more than one key_attribute (e.g. a type for entries in /etc/services with name and protocol as key_attributes) the provider will not store all key_attributes in property_hash and not all keyattributes will be visible in the to_line function. The create method of parsedfile will only put validproperties into the propertyhash. As result :name and all the other key_attributes will not be set. In the flush method however the :name parameter is put in the property_hash but the method does not handle other keyattributes. This patch modifies flush to put all key_attributes into the property hash (Note: @resource.name is basically just an alias for @resource[:name])
| | * | | | Merge branch 'ticket/2.6.x/5661' of https://github.com/stschulte/puppet into ↵Jesse Wolfe2011-03-141-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 2.6.next
| | | * | | | (#5661) Creating types dont work with >1 namevarStefan Schulte2010-12-231-4/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods [] and []= of type.rb are handling :name in a special way. When someone wants to access resource[:name] puppet tries to replace :name with the name_var. If the type has more than one key_attribute name_var is always returning false so we'll get the error Resource type <resourcetype> does not support parameter false This patch doesnt try to substitute :name if we dont have a single namevar, aka. we have more than one key_attribute
| | * | | | Merge branch 'ticket/2.6.next/6707' into 2.6.nextnfagerlund2011-03-141-1/+1
| | |\ \ \ \
| | | * | | | (#6707) Fix typo in rest_authconfig.rbnfagerlund2011-03-141-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | "Where" -> "were." Capitalize "ACL."
| | * | | | Merge branch 'ticket/2.6.next/6689' into 2.6.nextNick Lewis2011-03-115-25/+16
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | (#6689) Make inventory_active_record terminus search quicklyNick Lewis2011-03-115-25/+16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This terminus behaves the same on all supported DB platforms, by performing a limited portion of its query in SQL, and the rest of the comparison in Ruby. Its results are consistent with the YAML terminus. Paired-With: Jesse Wolfe
| * | | | Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.nextMax Martin2011-03-1118-25/+447
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '2.6.next' of github.com:puppetlabs/puppet: (#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 (#6338) Support searching on metadata in InventoryActiveRecord terminus (#6338) Implement search for InventoryActiveRecord facts terminus (#6338) Add an InventoryActiveRecord terminus for Facts
| | * | | Merge branch 'ticket/2.6.next/5392' into 2.6.nextMatt Robinson2011-03-092-16/+21
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5392: (#5392) Give a better error when realizing a non-existant resource
| | | * | | (#5392) Give a better error when realizing a non-existant resourceMatt Robinson2011-03-092-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can reproduce the error with a simple manifest Bogus_type <| title == 'foo' |> We used to fail because find_resource_type returned nil and we never checked if it was nil before calling methods on it. Reviewed-by: Max Martin <max@puppetlabs.com>
| | * | | | Merge branch 'tickets/2.6.x/2645' into 2.6.nextJesse Wolfe2011-03-095-4/+65
| | |\ \ \ \
| | | * | | | (#2645) Adding a less-stubby test to verify the "system" attribute's behaviorJesse Wolfe2011-03-092-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | | Fixed #2645 - Added support for creating system usersJames Turnbull2011-03-094-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Red Hat, Ubuntu, Debian and deriatives the -r flag allows creation of "system" users with a UID below that defined in /etc/login.defs. This commit adds support for a system parameter and a system_users feature which can be used like so: user { "foo": system => true, ensure => present, } This will create a user with a lower UID. The system parameter defaults to false.
| | * | | | | Merge branch 'maint/2.6.next/6338' into 2.6.nextNick Lewis2011-03-096-64/+54
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | maint: Remove serialization of InventoryFact valuesNick Lewis2011-03-093-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not necessary because fact values are always strings, and it wasn't doing the unnecessary job it was expected to do anyway.
| | | * | | | maint: Rename InventoryHost to InventoryNodeNick Lewis2011-03-096-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This had been conflating hosts and nodes, when nodes is the most accurate.
| | * | | | | 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 'ticket/2.6.next/6309-mount-proper-device' into 2.6.nextMax Martin2011-03-081-5/+33
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6309-mount-proper-device: maint:Refactor of mount provider integration tests
| | * | | | | maint:Refactor of mount provider integration testsMax Martin2011-03-081-5/+33
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a test for #6309, decided to refactor mount provider integration tests by adding return value to check_fstab method. Paired-with:Paul Berry <paul@puppetlabs.com>
| * | | | | 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>