diff options
| author | Sam Doran <sdoran@redhat.com> | 2020-03-02 20:16:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 17:16:58 -0800 |
| commit | a0c3d890c3decd7f7d65f7493d2c4d0ff9fda7d4 (patch) | |
| tree | 87d9639f78d1183b6363dc031bc2d26fd5fcab5f | |
| parent | 18377e639034c3d829cad041f2ca171a11f71cfd (diff) | |
| download | ansible-a0c3d890c3decd7f7d65f7493d2c4d0ff9fda7d4.tar.gz | |
[stable-2.9] Allow SSH synchronization between Docker containers (#65698) (#67713)
* [stable-2.9] Allow SSH synchronization between Docker containers
(cherry picked from commit 1c15a485c2)
Co-authored-by: Nabil BENDAFI <nabil@bendafi.fr>
* Add changelog
(cherry picked from commit 854925b0724ea6507c55a66cf340c23438de55b5)
Co-authored-by: Nabil BENDAFI <nabilbendafi@users.noreply.github.com>
| -rw-r--r-- | changelogs/fragments/65698-synchronize-docker-controller-managed.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/action/synchronize.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelogs/fragments/65698-synchronize-docker-controller-managed.yml b/changelogs/fragments/65698-synchronize-docker-controller-managed.yml new file mode 100644 index 0000000000..60180142e7 --- /dev/null +++ b/changelogs/fragments/65698-synchronize-docker-controller-managed.yml @@ -0,0 +1,2 @@ +bugfixes: + - synchronize - allow data to be passed between two managed nodes when using the docker connection plugin (https://github.com/ansible/ansible/pull/65698) diff --git a/lib/ansible/plugins/action/synchronize.py b/lib/ansible/plugins/action/synchronize.py index 0c0a89cbf0..0385cc9a72 100644 --- a/lib/ansible/plugins/action/synchronize.py +++ b/lib/ansible/plugins/action/synchronize.py @@ -391,7 +391,7 @@ class ActionModule(ActionBase): # If launching synchronize against docker container # use rsync_opts to support container to override rsh options - if self._remote_transport in ['docker', 'buildah']: + if self._remote_transport in ['docker', 'buildah'] and not use_delegate: # Replicate what we do in the module argumentspec handling for lists if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence): tmp_rsync_opts = _tmp_args.get('rsync_opts', []) |