diff options
| author | Brian Coca <bcoca@users.noreply.github.com> | 2021-08-04 15:54:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 14:54:55 -0500 |
| commit | d18ac7bdc0487ee964951e9256ff3fffbdc7d0a9 (patch) | |
| tree | cf01cd7725775bcd6689dd09ad3fcd505c0341f6 /lib/ansible | |
| parent | b866d6f7085a20c0d2c9eb548f8a61c70c6bd1de (diff) | |
| download | ansible-d18ac7bdc0487ee964951e9256ff3fffbdc7d0a9.tar.gz | |
fix ssh cli defaults (#75245) (#75314)
* fix ssh cli defaults (#75245)
* fix ssh cli defaults
fixes #75221
(cherry picked from commit e5a2fe4c419740e9a709b07b064063f54277b983)
* github conflict?
* removed retries backrpot
also removed tests since they rely on features that don't exist in this version
Diffstat (limited to 'lib/ansible')
| -rw-r--r-- | lib/ansible/cli/arguments/option_helpers.py | 8 | ||||
| -rw-r--r-- | lib/ansible/plugins/connection/ssh.py | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/ansible/cli/arguments/option_helpers.py b/lib/ansible/cli/arguments/option_helpers.py index dc3a88b53c..7492e781c5 100644 --- a/lib/ansible/cli/arguments/option_helpers.py +++ b/lib/ansible/cli/arguments/option_helpers.py @@ -261,13 +261,13 @@ def add_connect_options(parser): help="override the connection timeout in seconds (default=%s)" % C.DEFAULT_TIMEOUT) # ssh only - connect_group.add_argument('--ssh-common-args', default='', dest='ssh_common_args', + connect_group.add_argument('--ssh-common-args', default=None, dest='ssh_common_args', help="specify common arguments to pass to sftp/scp/ssh (e.g. ProxyCommand)") - connect_group.add_argument('--sftp-extra-args', default='', dest='sftp_extra_args', + connect_group.add_argument('--sftp-extra-args', default=None, dest='sftp_extra_args', help="specify extra arguments to pass to sftp only (e.g. -f, -l)") - connect_group.add_argument('--scp-extra-args', default='', dest='scp_extra_args', + connect_group.add_argument('--scp-extra-args', default=None, dest='scp_extra_args', help="specify extra arguments to pass to scp only (e.g. -l)") - connect_group.add_argument('--ssh-extra-args', default='', dest='ssh_extra_args', + connect_group.add_argument('--ssh-extra-args', default=None, dest='ssh_extra_args', help="specify extra arguments to pass to ssh only (e.g. -R)") parser.add_argument_group(connect_group) diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index be37190052..3f812c1cb1 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -92,6 +92,7 @@ DOCUMENTATION = ''' - name: ansible_ssh_common_args cli: - name: ssh_common_args + default: '' ssh_executable: default: ssh description: @@ -141,6 +142,7 @@ DOCUMENTATION = ''' version_added: '2.7' cli: - name: scp_extra_args + default: '' sftp_extra_args: description: Extra exclusive to the ``sftp`` CLI vars: @@ -154,8 +156,10 @@ DOCUMENTATION = ''' version_added: '2.7' cli: - name: sftp_extra_args + default: '' ssh_extra_args: description: Extra exclusive to the 'ssh' CLI + default: '' vars: - name: ansible_ssh_extra_args env: |