diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-10-01 15:36:47 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-10-02 08:40:52 +0000 |
| commit | f8a8d87af079fbe509d6654c42f0ae2ca8f9515c (patch) | |
| tree | 630f81c2f44d48138ceaf1a635a5ef579d572455 /docker | |
| parent | bcac8b82ad228f58ad1e422330ad60701046e5d5 (diff) | |
| download | kolla-f8a8d87af079fbe509d6654c42f0ae2ca8f9515c.tar.gz kolla-f8a8d87af079fbe509d6654c42f0ae2ca8f9515c.zip | |
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)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index c5b81d657..fbf4b3556 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")) }} |