valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39776 from cloudflare/proxy-schedule

Browse Source 
WIP: Save _schedule.conf under <proxy ID> dir
This commit is contained in:
C. R. Oldham 2017-03-02 09:27:44 -07:00 committed by GitHub
commit 965f474316
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/utils/schedule.py
View File

@ -443,6 +443,9 @@ class Schedule(object):
config_dir,
os.path.dirname(self.opts.get('default_include',
salt.config.DEFAULT_MINION_OPTS['default_include'])))
if salt.utils.is_proxy():
# each proxy will have a separate _schedule.conf file
minion_d_dir = os.path.join(minion_d_dir, self.opts['proxyid'])
if not os.path.isdir(minion_d_dir):
os.makedirs(minion_d_dir)