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

Merge pull request #831 from dcolish/develop

Browse Source 
Use str.format for template string
This commit is contained in:
Thomas S Hatch 2012-03-04 10:48:36 -08:00
commit 342b60e18a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config.py
View File

@ -155,8 +155,8 @@ def minion_config(path):
opts['master_ip'] = dns_check(opts['master']) opts['master_ip'] = dns_check(opts['master'])
opts['master_uri'] = 'tcp://%s:%s' % (opts['master_ip'], opts['master_uri'] = 'tcp://{ip}:{port}'.format(ip=opts['master_ip'],
opts['master_port']) port=opts['master_port'])
# Enabling open mode requires that the value be set to True, and # Enabling open mode requires that the value be set to True, and
# nothing else! # nothing else!