diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-10-03 08:17:26 -0700 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-10-03 08:17:26 -0700 |
| commit | 8f22e9ebb3c206a2957ad98cb541b12f043259dc (patch) | |
| tree | c3393c3cd52843b35cdb670fac1fc3a923516cd1 | |
| parent | 531255d8d956990885fad2c052bc47cf518dfc28 (diff) | |
| download | kolla-8f22e9ebb3c206a2957ad98cb541b12f043259dc.tar.gz kolla-8f22e9ebb3c206a2957ad98cb541b12f043259dc.zip | |
swift-proxy-server: Ubuntu is still on Python 2
Change-Id: Ie174d1154bfe9295e5dae05ac885a5fa88487d4d
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 15 |
1 files changed, 11 insertions, 4 deletions
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")) }} |