diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-10 10:31:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-10 10:31:52 +0000 |
| commit | 7f4a32e1a38b7887c165b88d6ea3c31cef29abca (patch) | |
| tree | ab13985a0d88f6d4fa0b23ff1991eca478896030 /docker/swift | |
| parent | 154bc37f637bb6b164cfbe9e2a1769dd431b49d3 (diff) | |
| parent | d2966452c56c3dee27839a8d277eb069671b51df (diff) | |
| download | kolla-7f4a32e1a38b7887c165b88d6ea3c31cef29abca.tar.gz kolla-7f4a32e1a38b7887c165b88d6ea3c31cef29abca.zip | |
Merge "ubuntu: move to 20.04 Focal"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 8a2b903ed..4d57b32e3 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -14,17 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-ceilometermiddleware' ] %} {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - {% set swift_proxy_server_packages = [ - 'swift-proxy', - 'python3-ceilometermiddleware' - ] %} - {% else %} - {% set swift_proxy_server_packages = [ - 'swift-proxy', - 'python-ceilometermiddleware' - ] %} - {% endif %} + {% set swift_proxy_server_packages = [ + 'swift-proxy', + 'python3-ceilometermiddleware' + ] %} {% endif %} {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} |