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 #22760 from thatch45/syndic_fix

Browse source 
Fix issues with the syndic
This commit is contained in:
Justin Findlay 2015-04-16 22:30:48 -06:00
commit 20d3f2bb83
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/config.py
View file

@ -948,6 +948,7 @@ def syndic_config(master_config_path,
'id': minion_opts['id'],
'pki_dir': minion_opts['pki_dir'],
'master': opts['syndic_master'],
'interface': master_opts['interface'],
'master_port': int(
opts.get(
# The user has explicitly defined the syndic master port