diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-03 19:12:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-03 19:12:17 +0000 |
| commit | 8124117c1c39a83a070f7ffa00d4a894e314ec8c (patch) | |
| tree | 39a7ea9da9816d337098789a9cfdbb38bdc5a2e7 /docker | |
| parent | c2b5b1029a955fcec88964fe992beb61bd8fa7b2 (diff) | |
| parent | 8f22e9ebb3c206a2957ad98cb541b12f043259dc (diff) | |
| download | kolla-8124117c1c39a83a070f7ffa00d4a894e314ec8c.tar.gz kolla-8124117c1c39a83a070f7ffa00d4a894e314ec8c.zip | |
Merge "swift-proxy-server: Ubuntu is still on Python 2"
Diffstat (limited to 'docker')
| -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")) }} |