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

Ensure only one fileserver update in a masterless run

Browse Source 
Resolves #30100.
This commit is contained in:
Erik Johnson 2016-06-15 14:49:27 -05:00
parent 7d940aed1f
commit 715e7af8a4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/fileserver/__init__.py
View File

@ -723,7 +723,12 @@ class FSChan(object):
self.kwargs = kwargs self.kwargs = kwargs
self.fs = Fileserver(self.opts) self.fs = Fileserver(self.opts)
self.fs.init() self.fs.init()
self.fs.update() if self.opts.get('file_client', 'remote') == 'local':
if '__fs_update' not in self.opts:
self.fs.update()
self.opts['__fs_update'] = True
else:
self.fs.update()
self.cmd_stub = {'ext_nodes': {}} self.cmd_stub = {'ext_nodes': {}}
def send(self, load, tries=None, timeout=None): def send(self, load, tries=None, timeout=None):