openstack
/
kolla
Code Issues Proposed changes

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 d61c54be9d)
This commit is contained in:
Mark Goddard 2019-10-01 15:36:47 +01:00
parent bcac8b82ad
commit f8a8d87af0
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,24 +10,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set swift_base_packages = [ {% set swift_base_packages = [
'openstack-swift', 'nmap-ncat',
'nmap-ncat' 'openstack-swift',
] ] %}
%}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set swift_base_packages = [ {% set swift_base_packages = [
'swift', 'netcat-openbsd',
'netcat-openbsd' 'rsync',
] 'swift',
%} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(swift_base_packages | customizable("packages")) }} {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% 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' %} {% elif base_package_type == 'deb' %}
{% set swift_base_packages = ['liberasurecode-dev','netcat-openbsd'] %} {% set swift_base_packages = [
'liberasurecode-dev',
'netcat-openbsd',
'rsync',
] %}
{% endif %} {% endif %}
{{ macros.install_packages(swift_base_packages | customizable("packages")) }} {{ macros.install_packages(swift_base_packages | customizable("packages")) }}