Skip to content

Commit

Permalink
Merge pull request #49182 from terminalmage/salt-jenkins-1078
Browse files Browse the repository at this point in the history
Fix hanging syndic test
  • Loading branch information
Mike Place committed Aug 18, 2018
2 parents b3a247b + a2d2cd3 commit 134f125
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tests/integration/__init__.py
Expand Up @@ -742,6 +742,7 @@ def transplant_configs(cls, transport='zeromq'):
master_opts['config_dir'] = RUNTIME_VARS.TMP_CONF_DIR
master_opts['root_dir'] = os.path.join(TMP, 'rootdir')
master_opts['pki_dir'] = os.path.join(TMP, 'rootdir', 'pki', 'master')
master_opts['syndic_master'] = 'localhost'

# This is the syndic for master
# Let's start with a copy of the syndic master configuration
Expand Down

0 comments on commit 134f125

Please sign in to comment.