saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25011 from notpeter/s3_2014.7_backport

Browse source 
Add s3 to protocols for remote source_hash (2014.7 backport)
This commit is contained in:
Justin Findlay 2015-06-27 16:35:44 -06:00
commit a7154e7471
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/file.py
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']
protos = ['salt', 'http', 'https', 'ftp', 'swift', 's3']
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)