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

Set salt:// correct paths

Browse source
This commit is contained in:
Thomas S Hatch 2011-05-28 23:17:25 -06:00
parent 954ced77b9
commit 660bac9a3a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/minion.py
View file

@ -350,6 +350,7 @@ class FileClient(object):
'''
Make sure that this path is intended for the salt master and trim it
'''
print path
if not path.startswith('salt://'):
raise MinionError('Unsupported path')
return path[7:]
@ -434,7 +435,10 @@ class FileClient(object):
'''
if sls.count('.'):
sls = sls.replace('.', '/')
for path in [sls + '.sls', os.path.join(sls, 'init.sls')]:
for path in [
'salt://' + sls + '.sls',
os.path.join('salt://', sls, 'init.sls')
]:
dest = self.cache_file(path, env)
if dest:
return dest