diff options
| author | James Cammarata <jimi@sngx.net> | 2014-06-24 10:45:11 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2014-06-24 10:45:38 -0500 |
| commit | 1adb6dfa051498b70ac34b4ac12524952c126149 (patch) | |
| tree | 8252fcd4d2932716d1fea67e6b039dee90d63d39 /lib/ansible/runner | |
| parent | bbaf80322711a23dfd1ea0b85fa84e61aa9db200 (diff) | |
| download | ansible-1adb6dfa051498b70ac34b4ac12524952c126149.tar.gz | |
Remove redundant 'self.user or' added by 0f91add
Diffstat (limited to 'lib/ansible/runner')
| -rw-r--r-- | lib/ansible/runner/connection_plugins/ssh.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py index bddbd88af3..ca6fdb3a6f 100644 --- a/lib/ansible/runner/connection_plugins/ssh.py +++ b/lib/ansible/runner/connection_plugins/ssh.py @@ -94,7 +94,7 @@ class Connection(object): self.common_args += ["-o", "KbdInteractiveAuthentication=no", "-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey", "-o", "PasswordAuthentication=no"] - self.common_args += ["-o", "User=" + (self.user or self.user or pwd.getpwuid(os.geteuid())[0])] + self.common_args += ["-o", "User=" + (self.user or pwd.getpwuid(os.geteuid())[0])] self.common_args += ["-o", "ConnectTimeout=%d" % self.runner.timeout] return self |