Merge pull request #7079 from mscherer/fix_error_whitespace_in_config

Clean a bit more the ssh_args configuration
pull/7097/head
James Cammarata 11 years ago
commit 086b877719

@ -59,7 +59,8 @@ class Connection(object):
self.common_args = []
extra_args = C.ANSIBLE_SSH_ARGS
if extra_args is not None:
self.common_args += shlex.split(extra_args)
# make sure there is no empty string added as this can produce weird errors
self.common_args += [x.strip() for x in shlex.split(extra_args) if x.strip()]
else:
self.common_args += ["-o", "ControlMaster=auto",
"-o", "ControlPersist=60s",

Loading…
Cancel
Save