diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-03-13 14:57:39 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-03-25 11:54:08 +1100 |
| commit | 19863c07f983ec181fb81c797ee8b9c8d335e18c (patch) | |
| tree | 6f457f4e7ff5eb2b7a0aebf3baf61664ab147dd2 /lib/puppet/file_serving | |
| parent | fd76142b314c390205570d02383607ff91b23391 (diff) | |
| download | puppet-19863c07f983ec181fb81c797ee8b9c8d335e18c.tar.gz puppet-19863c07f983ec181fb81c797ee8b9c8d335e18c.tar.xz puppet-19863c07f983ec181fb81c797ee8b9c8d335e18c.zip | |
Fix #2929 - Allow checksum to be "none"
File checksum is "md5" by default. When managing local files (not sourced
or content) it might be desirable to not checksum files, especially
when managing deep hierarchies containing many files.
This patch allows to write such manifests:
file {
"/path/to/deep/hierarchy":
owner => brice, recurse => true, checksum => none
}
Then puppet(d) won't checksum those files, just manage their ownership.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/file_serving')
| -rw-r--r-- | lib/puppet/file_serving/fileset.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/terminus_helper.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index 50e4e1e80..a66d9356f 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -9,7 +9,7 @@ require 'puppet/file_serving/metadata' # Operate recursively on a path, returning a set of file paths. class Puppet::FileServing::Fileset attr_reader :path, :ignore, :links - attr_accessor :recurse, :recurselimit + attr_accessor :recurse, :recurselimit, :checksum_type # Produce a hash of files, with merged so that earlier files # with the same postfix win. E.g., /dir1/subfile beats /dir2/subfile. @@ -105,7 +105,7 @@ class Puppet::FileServing::Fileset end def initialize_from_request(request) - [:links, :ignore, :recurse, :recurselimit].each do |param| + [:links, :ignore, :recurse, :recurselimit, :checksum_type].each do |param| if request.options.include?(param) # use 'include?' so the values can be false value = request.options[param] elsif request.options.include?(param.to_s) diff --git a/lib/puppet/file_serving/terminus_helper.rb b/lib/puppet/file_serving/terminus_helper.rb index c88bacc4a..6f5d52b25 100644 --- a/lib/puppet/file_serving/terminus_helper.rb +++ b/lib/puppet/file_serving/terminus_helper.rb @@ -16,6 +16,7 @@ module Puppet::FileServing::TerminusHelper Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path| inst = model.new(base_path, :relative_path => file) + inst.checksum_type = request.options[:checksum_type] if request.options[:checksum_type] inst.links = request.options[:links] if request.options[:links] inst.collect inst |