openstack
/
kolla
Code Issues Proposed changes

Merge "Install rsync in swift-base containers on Debian/Ubuntu" into stable/queens

This commit is contained in:
Zuul 2019-10-07 11:24:45 +00:00 committed by Gerrit Code Review
parent 33e170d3b5 2b37f39126
commit 27a1000215
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/swift/swift-base/Dockerfile.j2
View File

@ -16,10 +16,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
%}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_base_packages = [
'swift',
'netcat-openbsd'
]
%}
'netcat-openbsd',
'rsync',
'swift',
] %}
{% endif %}
{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_base_packages = ['liberasurecode-devel','nmap-ncat'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% 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")) }}