From c2665d032c57ea02ee6692155c020e3a1cb72154 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 3 Dec 2020 19:31:58 +0200
Subject: [PATCH] Use synchronize module for rings distribution

Instead of using rsync which do not respect ssh ports, we fetch rings
to the deploy host and distribute them back to swift hosts

Change-Id: I9f8bc0af9803d2a235b3da956b5618adfe195c00
Closes-Bug: #1904935
---
 tasks/swift_rings_distribute.yml | 44 ++++++++------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/tasks/swift_rings_distribute.yml b/tasks/swift_rings_distribute.yml
index b8876709..d738f298 100644
--- a/tasks/swift_rings_distribute.yml
+++ b/tasks/swift_rings_distribute.yml
@@ -13,37 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# NOTE(cloudnull): These methods have been changed to use the rsync command
-#  instead of the Synchronize module. The change was required due to an upstream
-#  issue with the module when running with delegate_to and become. Sadly the fix
-#  does not seem to be trivial. "https://github.com/ansible/ansible/issues/15405"
+- name: Pull swift rings to localhost
+  synchronize:
+    src: /etc/swift/ring_build_files/
+    dest: "{{ lookup('env', 'OSA_CONFIG_DIR') }}/ring_build_files/"
+    mode: pull
+  when: _swift_is_first_play_host
 
-# TODO(logan): Change to synchronize module to pass ANSIBLE0006
-# and remove the skip_ansible_lint tag at that time.
-- name: "Get swift rings"
-  command: >
-    rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
-          -avz {{ swift_system_user_name }}@{{ hostvars[groups['swift_hosts'][0]]['ansible_host'] }}:/etc/swift/ring_build_files/
-          /etc/swift/
-  args:
-    warn: no
-  become: yes
-  become_user: "{{ swift_system_user_name }}"
-  changed_when: false
-  tags:
-    - skip_ansible_lint
-
-# TODO(logan): Change to synchronize module to pass ANSIBLE0006
-# and remove the skip_ansible_lint tag at that time.
-- name: "Get swift rings for backup in ring_build_files directory"
-  command: >
-    rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
-          -avz {{ swift_system_user_name }}@{{ hostvars[groups['swift_hosts'][0]]['ansible_host'] }}:/etc/swift/ring_build_files/
-          /etc/swift/ring_build_files/
-  args:
-    warn: no
-  become: yes
-  become_user: "{{ swift_system_user_name }}"
-  changed_when: false
-  tags:
-    - skip_ansible_lint
+- name: Upload swift rings
+  synchronize:
+    src: "{{ lookup('env', 'OSA_CONFIG_DIR') }}/ring_build_files/"
+    dest: /etc/swift/
+    mode: push