saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Dump multi-line yaml into the SHIM

Browse source 
Minion config will be larger now, width isn't enough to make sure it's
only a single line
This commit is contained in:
Colton Myers 2015-05-01 12:35:48 -06:00
parent b751a7281c
commit fe87f0fe39
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/client/ssh/__init__.py
View file

@ -570,7 +570,7 @@ class Single(object):
'id': self.id,
'sock_dir': '/',
})
self.minion_config = yaml.dump(minion_opts, width=1000).strip()
self.minion_config = yaml.dump(minion_opts).strip()
self.target = kwargs
self.target.update(args)
self.serial = salt.payload.Serial(opts)
@ -771,7 +771,10 @@ class Single(object):
debug = '1'
arg_str = '''
OPTIONS = OBJ()
OPTIONS.config = '{0}'
OPTIONS.config = \
"""
{0}
"""
OPTIONS.delimiter = '{1}'
OPTIONS.saltdir = '{2}'
OPTIONS.checksum = '{3}'