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

Check for IPv6 address master_uri address

Browse Source 
Signed-off-by: Florian Zavatzki <fz@binsec.de>
This commit is contained in:
Florian Zavatzki 2014-05-08 13:13:52 +02:00
parent 51ad28a4d8
commit 3628432d79
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/config.py
View File

@ -2016,8 +2016,11 @@ def client_config(path, env_var='SALT_CLIENT_CONFIG', defaults=None):
# Make sure the master_uri is set
if 'master_uri' not in opts:
opts['master_uri'] = 'tcp://{ip}:{port}'.format(ip=opts['interface'],
port=opts['ret_port'])
opts['master_uri'] = 'tcp://{ip}:{port}'.format(
ip=salt.utils.ip_bracket(opts['interface']),
port=opts['ret_port']
)
# Return the client options
_validate_opts(opts)
return opts