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 mem leak caused by pki_dir

Browse source
This commit is contained in:
twangboy 2016-06-28 09:08:45 -07:00 • committed by Mike Place
parent 7f3f15378e
commit 54647eb7d8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/__init__.py
View file

@ -987,6 +987,8 @@ class TestDaemon(object):
master_opts['user'] = running_tests_user
master_opts['known_hosts_file'] = tests_known_hosts_file
master_opts['config_dir'] = TMP_CONF_DIR
master_opts['cachedir'] = os.path.join(TMP, 'rootdir', 'cache')
#master_opts['pki_dir'] = os.path.join(TMP, 'rootdir','pki')
minion_opts = salt.config._read_conf_file(os.path.join(CONF_DIR, 'minion'))
minion_opts['user'] = running_tests_user
@ -1002,6 +1004,8 @@ class TestDaemon(object):
syndic_master_opts['user'] = running_tests_user
syndic_master_opts['root_dir'] = os.path.join(TMP, 'rootdir-syndic-master')
syndic_master_opts['config_dir'] = TMP_SYNDIC_MASTER_CONF_DIR
syndic_master_opts['cachedir'] = os.path.join(TMP, 'rootdir-syndic-master', 'cache')
#syndic_master_opts['pki_dir'] = os.path.join(TMP, 'rootdir-syndic-master', 'pki')
# The syndic config file has an include setting to include the master configuration
# Let's start with a copy of the syndic master configuration

2
tests/integration/files/conf/master
View file

@ -4,9 +4,7 @@ publish_port: 64505
ret_port: 64506
worker_threads: 3
pidfile: master.pid
cachedir: cache
sock_dir: master_sock
pki_dir: pki
timeout: 3
open_mode: True
syndic_master: localhost

2
tests/integration/files/conf/syndic_master
View file

@ -4,9 +4,7 @@ publish_port: 54505
ret_port: 54506
worker_threads: 3
pidfile: syndic_master.pid
cachedir: cache
sock_dir: syndic_master_sock
pki_dir: pki
timeout: 1
open_mode: True
order_masters: True