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

Add interface to all configs

Browse Source 
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
This commit is contained in:
Mike Place 2016-07-13 10:02:58 -06:00
parent 4e56d28993
commit 5f5d7193b0
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
# Master Settings # Master Settings
# Connects to syndic_master via syndic # Connects to syndic_master via syndic
id: master id: master
interface: 127.0.0.1
publish_port: 64505 publish_port: 64505
ret_port: 64506 ret_port: 64506
worker_threads: 3 worker_threads: 3

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

@ -2,6 +2,7 @@
# Connects to master # Connects to master
master: localhost master: localhost
master_port: 64506 master_port: 64506
interface: 127.0.0.1
tcp_pub_port: 64510 tcp_pub_port: 64510
tcp_pull_port: 64511 tcp_pull_port: 64511
sock_dir: minion_sock sock_dir: minion_sock

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

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

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

@ -1,5 +1,6 @@
# Syndic Settings # Syndic Settings
id: syndic id: syndic
interface: 127.0.0.1
syndic_master: localhost syndic_master: localhost
syndic_master_port: 54506 syndic_master_port: 54506
syndic_log_file: syndic.log syndic_log_file: syndic.log

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

@ -1,6 +1,7 @@
# Master Settings # Master Settings
# This is the Master of Masters # This is the Master of Masters
id: syndic_master id: syndic_master
interface: 127.0.0.1
publish_port: 54505 publish_port: 54505
ret_port: 54506 ret_port: 54506
worker_threads: 3 worker_threads: 3