diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-06-30 14:24:51 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-08-07 14:38:02 +0000 |
| commit | d2966452c56c3dee27839a8d277eb069671b51df (patch) | |
| tree | 9253afed21c7b0e82689962409cf7d58a33d4261 /docker/swift | |
| parent | 53d98f540f3af9972cf3040e529f7d2f14c4bc4b (diff) | |
| download | kolla-d2966452c56c3dee27839a8d277eb069671b51df.tar.gz kolla-d2966452c56c3dee27839a8d277eb069671b51df.zip | |
ubuntu: move to 20.04 Focal
There is a time once every 2 years when ubuntu team releases new LTS
release. And then UCA joins with binary packages for current OpenStack
development cycle.
It is this time for Ubuntu 20.04 'focal'.
Depends-On: https://review.opendev.org/745156
Change-Id: I045aa6b4b4fd83fbe7d1fda89549f0ef1e88ec12
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")) }} |