Merge pull request #25750 from alekti/2014.7

Add file as supported protocol for file source_hash. Fixes #25701.
This commit is contained in:
Justin Findlay 2015-07-28 20:31:27 -06:00
commit d93eb87c16

View file

@ -2556,7 +2556,7 @@ def get_managed(
if not source_sum:
return '', {}, 'Source file {0} not found'.format(source)
elif source_hash:
protos = ['salt', 'http', 'https', 'ftp', 'swift', 's3']
protos = ['salt', 'http', 'https', 'ftp', 'swift', 's3', 'file']
if salt._compat.urlparse(source_hash).scheme in protos:
# The source_hash is a file on a server
hash_fn = __salt__['cp.cache_file'](source_hash, saltenv)