From f8a8d87af079fbe509d6654c42f0ae2ca8f9515c Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 1 Oct 2019 15:36:47 +0100
Subject: [PATCH] Install rsync in swift-base containers on Debian/Ubuntu

This is used by the replicator services.

Change-Id: Iad7ad20542a159469d95e990c20564633046b251
Closes-Bug: #1846207
(cherry picked from commit d61c54be9d281a024a448f783dbde037d5fd1cda)
---
 docker/swift/swift-base/Dockerfile.j2 | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index c5b81d6570..fbf4b3556f 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -10,24 +10,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
         {% set swift_base_packages = [
-                'openstack-swift',
-                'nmap-ncat'
-            ]
-        %}
+            'nmap-ncat',
+            'openstack-swift',
+        ] %}
     {% elif base_package_type == 'deb' %}
         {% set swift_base_packages = [
-                'swift',
-                'netcat-openbsd'
-             ]
-        %}
+            'netcat-openbsd',
+            'rsync',
+            'swift',
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
-        {% set swift_base_packages = ['liberasurecode-devel','nmap-ncat'] %}
+        {% set swift_base_packages = [
+            'liberasurecode-devel',
+            'nmap-ncat',
+        ] %}
     {% elif base_package_type == 'deb' %}
-        {% set swift_base_packages = ['liberasurecode-dev','netcat-openbsd'] %}
+        {% set swift_base_packages = [
+            'liberasurecode-dev',
+            'netcat-openbsd',
+            'rsync',
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(swift_base_packages | customizable("packages")) }}