From e3aac5cea7521a62bba170d9cff1d3963b7158bd Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 8 Jul 2020 12:17:31 +1000
Subject: [PATCH] promote-deployment: use upload-afs-synchronize

The prior change Ie8fcf62706cd69f20e29bc1f2f29c5d266ff443f updated
some incorrect rsync copy flags to work around AFS permissions.  This
was something already figured out by the upload-afs-synchronize role
which was intended to be a generic way to upload things to AFS with
the synchronize module (used by tarball and other artifact
publishing).  Use it instead to standardise the way we copy.

Change-Id: I49afb49dd8301abec44c2aacddb8c62e73e0eb02
---
 playbooks/artifacts/promote-deployment.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/playbooks/artifacts/promote-deployment.yaml b/playbooks/artifacts/promote-deployment.yaml
index 53b0118..44988dc 100644
--- a/playbooks/artifacts/promote-deployment.yaml
+++ b/playbooks/artifacts/promote-deployment.yaml
@@ -44,13 +44,12 @@
         dest: "{{ src_dir }}"
       loop: "{{files.files}}"
     - name: Upload to AFS
-      synchronize:
-        delete: yes
-        recursive: yes
-        src: "{{ src_dir }}/"
-        dest: "{{ target_dir }}/"
-        owner: false
-        group: false
+      include_role:
+        name: upload-afs-synchronize
+      vars:
+        afs_source: '{{ src_dir }}/'
+        afs_target: '{{ target_dir }}/'
+        afs_copy_only: false
       delegate_to: "{{ inventory_hostname }}"
     - name: Destroy AFS token
       include_role: