openstack
/
kolla
Code Issues Proposed changes

Merge "swift-proxy-server: Ubuntu is still on Python 2"

This commit is contained in:
Zuul 2019-10-03 19:12:17 +00:00 committed by Gerrit Code Review
parent c2b5b1029a 8f22e9ebb3
commit 8124117c1c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -20,10 +20,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set swift_proxy_server_packages = [
'swift-proxy',
'python3-ceilometermiddleware'
] %}
{% if base_distro == 'debian' %}
{% set swift_proxy_server_packages = [
'swift-proxy',
'python3-ceilometermiddleware'
] %}
{% else %}
{% set swift_proxy_server_packages = [
'swift-proxy',
'python-ceilometermiddleware'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}