From 8f22e9ebb3c206a2957ad98cb541b12f043259dc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Oct 2019 08:17:26 -0700 Subject: swift-proxy-server: Ubuntu is still on Python 2 Change-Id: Ie174d1154bfe9295e5dae05ac885a5fa88487d4d --- docker/swift/swift-proxy-server/Dockerfile.j2 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 011674ee4..3ed6b965a 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -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")) }} -- cgit v1.2.3