diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-01 18:25:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-01 18:25:44 +0000 |
| commit | 121503e58902d706cee67c26bda4a6bef35848a7 (patch) | |
| tree | 25f34052fc1beba9da98d570c63a78e4d376866f | |
| parent | a9181bf89529756e4d58b22324988b4e57770ec1 (diff) | |
| parent | d61c54be9d281a024a448f783dbde037d5fd1cda (diff) | |
| download | kolla-121503e58902d706cee67c26bda4a6bef35848a7.tar.gz kolla-121503e58902d706cee67c26bda4a6bef35848a7.zip | |
Merge "Install rsync in swift-base containers on Debian/Ubuntu"
| -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")) }} |