diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-30 20:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-30 20:13:03 +0000 |
| commit | e97239f03e734195a49b383f0e77aae3bdea9a35 (patch) | |
| tree | 6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /docker/ceilometer | |
| parent | 63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff) | |
| parent | 4b4e26262b9e03190c639481fb60a8f4f92c532a (diff) | |
| download | kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip | |
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index e587ad861..bd0aa4c6b 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -20,9 +20,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} - {% set ceilometer_compute_packages = [ - 'libvirt-python' - ] %} + {% if distro_python_version.startswith('3') %} + {% set ceilometer_compute_packages = [ + 'python3-libvirt' + ] %} + {% else %} + {% set ceilometer_compute_packages = [ + 'libvirt-python' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set ceilometer_compute_packages = [ 'python3-libvirt' |