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

Remove configuration from configs

Browse Source
This commit is contained in:
twangboy 2016-07-07 17:27:47 -06:00 committed by Mike Place
parent 68e5620b92
commit c1ae2537f1
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/integration/files/conf/master
View File

@ -1,5 +1,4 @@
id: master
interface: 127.0.0.1
publish_port: 64505
ret_port: 64506
worker_threads: 3

2
tests/integration/files/conf/minion
View File

@ -1,7 +1,6 @@
# basic config
master: localhost
master_port: 64506
interface: 127.0.0.1
tcp_pub_port: 64510
tcp_pull_port: 64511
sock_dir: minion_sock
@ -10,7 +9,6 @@ open_mode: True
log_file: minion.log
log_level_logfile: debug
pidfile: minion.pid
ipc_mode: tcp
# module extension
test.foo: baz

1
tests/integration/files/conf/sub_minion
View File

@ -1,7 +1,6 @@
# basic config
master: localhost
master_port: 64506
interface: 127.0.0.1
tcp_pub_port: 64520
tcp_pull_port: 64521
sock_dir: sub_minion_sock

1
tests/integration/files/conf/syndic_master
View File

@ -1,5 +1,4 @@
id: syndic_master
interface: 127.0.0.1
publish_port: 54505
ret_port: 54506
worker_threads: 3

13
tests/runtests.py
View File

@ -401,6 +401,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
print_header(' * Minion configuration values', top=True)
print('interface: {0}'.format(minion_conf['interface']))
print('master: {0}'.format(minion_conf['master']))
print('master port: {0}'.format(minion_conf['master_port']))
print('ipc mode: {0}'.format(minion_conf['ipc_mode']))
print('tcp pub port: {0}'.format(minion_conf['tcp_pub_port']))
@ -409,23 +410,25 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
print_header(' * Sub Minion configuration values', top=True)
print('interface: {0}'.format(sub_minion_conf['interface']))
print('master: {0}'.format(sub_minion_conf['master']))
print('master port: {0}'.format(sub_minion_conf['master_port']))
print('ipc mode: {0}'.format(sub_minion_conf['ipc_mode']))
print('tcp pub port: {0}'.format(sub_minion_conf['tcp_pub_port']))
print('tcp pull port: {0}'.format(sub_minion_conf['tcp_pull_port']))
print('\n')
print_header(' * Syndic configuration values', top=True)
print('interface: {0}'.format(syndic_conf['interface']))
print('syndic master: {0}'.format(syndic_conf['syndic_master']))
print('syndic master port: {0}'.format(syndic_conf['syndic_master_port']))
print('\n')
print_header(' * Syndic master configuration values', top=False)
print('interface: {0}'.format(syndic_master_conf['interface']))
print('publish port: {0}'.format(syndic_master_conf['publish_port']))
print('return port: {0}'.format(syndic_master_conf['ret_port']))
print('\n')
print_header(' * Syndic configuration values', top=True)
print('interface: {0}'.format(syndic_conf['interface']))
print('syndic master port: {0}'.format(syndic_conf['syndic_master']))
print('\n')
print_header(' Your client configuration is at {0}'.format(TestDaemon.config_location()))
print('To access the minion: `salt -c {0} minion test.ping'.format(TestDaemon.config_location()))