diff options
| author | Sandra McCann <samccann@redhat.com> | 2022-09-15 15:40:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 14:40:55 -0500 |
| commit | e69c1812c91cae6c7a6e50d1874f11a427d23fa6 (patch) | |
| tree | 936ab6b5696faab22b79b2c71b9006307660e18d /lib | |
| parent | 811d05e1ba7af83b6a8ffa4ab30327adc0a180ed (diff) | |
| download | ansible-e69c1812c91cae6c7a6e50d1874f11a427d23fa6.tar.gz | |
Backportapalooza 9 15 (#78787)
* add galaxy docs back to core' (#78764)
(cherry picked from commit df6a564abd9a63e1bff0ad14f9b800ceccc2da31)
* Ansible 6.4.0: Porting Guide (#78775)
(cherry picked from commit d4407ca68822b1f12254957ec9918f94c23d374f)
* Documented connection parameters required to enable scp (OpenSSH >=9.0) (#78745)
(cherry picked from commit 952ee88f33de4d49ff5f7bd4bec3431a4b0fdc78)
* Fix Issue #78564 (#78741)
(cherry picked from commit f50ff1c2dbb2eee88b2ac9e50e9f13d942e41f12)
* faq legacy vs builtin (#78769)
(cherry picked from commit db33ca8e1a8b9805eb0a074eee86aaa2237065cd)
* Removed repeated introduction paragraph (#78691)
(cherry picked from commit e276770ee9efac3a98c3f1116d9cd9c992ca8c9e)
Co-authored-by: Ompragash Viswanathan <21008429+Ompragash@users.noreply.github.com>
Co-authored-by: wnjuguna <jbworldus@gmail.com>
Co-authored-by: Ronan <ronandoudies@gmail.com>
Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/modules/unarchive.py | 3 | ||||
| -rw-r--r-- | lib/ansible/plugins/connection/ssh.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/ansible/modules/unarchive.py b/lib/ansible/modules/unarchive.py index c5da961573..7ac19fc7d9 100644 --- a/lib/ansible/modules/unarchive.py +++ b/lib/ansible/modules/unarchive.py @@ -123,7 +123,8 @@ attributes: bypass_host_loop: support: none check_mode: - support: full + support: partial + details: Not supported for gzipped tar files. diff_mode: support: partial details: Uses gtar's C(--diff) arg to calculate if changed or not. If this C(arg) is not supported, it will always unpack the archive. diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index e3b7cec68c..b9d1f1052a 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -292,6 +292,7 @@ DOCUMENTATION = ''' description: - "Preferred method to use when transferring files over ssh" - Setting to 'smart' (default) will try them in order, until one succeeds or they all fail + - For OpenSSH >=9.0 you must add an additional option to enable scp (scp_extra_args="-O") - Using 'piped' creates an ssh pipe with C(dd) on either side to copy the data choices: ['sftp', 'scp', 'piped', 'smart'] env: [{name: ANSIBLE_SSH_TRANSFER_METHOD}] @@ -310,6 +311,7 @@ DOCUMENTATION = ''' - "Preferred method to use when transferring files over SSH." - When set to I(smart), Ansible will try them until one succeeds or they all fail. - If set to I(True), it will force 'scp', if I(False) it will use 'sftp'. + - For OpenSSH >=9.0 you must add an additional option to enable scp (scp_extra_args="-O") - This setting will overridden by ssh_transfer_method if set. env: [{name: ANSIBLE_SCP_IF_SSH}] ini: |