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

Merge pull request #25704 from cachedout/master_type_2014_7

Browse Source 
Ensure prior alignment with master_type in 2014.7
This commit is contained in:
Thomas S Hatch 2015-07-27 10:06:35 -06:00
commit 3a15df22ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config.py
View File

@ -271,7 +271,7 @@ VALID_OPTS = {
DEFAULT_MINION_OPTS = {
'interface': '0.0.0.0',
'master': 'salt',
'master_type': 'standard',
'master_type': 'str',
'master_port': '4506',
'master_finger': '',
'master_shuffle': False,

2
salt/minion.py
View File

@ -686,7 +686,7 @@ class Minion(MinionBase):
(possibly failed) master will then be removed from the list of masters.
'''
# check if master_type was altered from its default
if opts['master_type'] != 'standard':
if opts['master_type'] != 'str':
# check for a valid keyword
if opts['master_type'] == 'func':
# split module and function and try loading the module