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

Fix the old file_root refs

Browse source
This commit is contained in:
Thomas S Hatch 2011-05-28 14:07:20 -06:00
parent adb4fef229
commit d5ee3cecf0
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/config.py
View file

@ -79,6 +79,7 @@ def master_config(path):
'open_mode': False,
'auto_accept': False,
'renderer': 'yaml_jinja',
'state_top': 'top.yml',
'log_file': '/var/log/salt/master',
'log_level': 'warning',
'log_granular_levels': {},

11
salt/state.py
View file

@ -306,17 +306,10 @@ class HighState(object):
opts['renderer'] = mopts['renderer']
if mopts['state_top'].startswith('salt://'):
opts['state_top'] = mopts['state_top']
elif mopts['state_top'].startswith(mopts['file_root']):
opts['state_top'] = os.path.join(
'salt://',
os.path.relpath(
mopts['state_top'], mopts['file_root'])
)
elif not mopts['state_top'].startswith('/'):
opts['state_top'] = os.path.join('salt://', mopts['state_top'])
opts['state_top'] = os.path.join('salt://', mopts['state_top'][1:])
else:
log.error('Invalid top file location')
raise StateError('Invalid top file location')
opts['state_top'] = os.path.join('salt://', mopts['state_top'])
return opts
def get_top(self):