diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-17 13:01:42 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-01-29 11:41:38 +0000 |
| commit | 4b4e26262b9e03190c639481fb60a8f4f92c532a (patch) | |
| tree | a1e6a6404e006a620c98ac8a37b3eec3f1ae250b /docker/ceilometer | |
| parent | bdb0dbddbc30215169baaaa263c583e7d3183607 (diff) | |
| download | kolla-4b4e26262b9e03190c639481fb60a8f4f92c532a.tar.gz kolla-4b4e26262b9e03190c639481fb60a8f4f92c532a.zip | |
CentOS 8: Update packages in images
* Some further changes for python2 vs python3 packages
* Allow rabbitmq 3.7.*, since a newer erlang is available
* Switch from qemu-img-ev to qemu-img on CentOS 8
* bridge-utils no longer available on CentOS 8
* libvirt-daemon-driver-lxc no longer available on CentOS 8
* Mark some more images buildable for CentOS 8
Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08
Partially-Implements: blueprint centos-rhel-8
Partially-Implements: blueprint centos-rhel-python-3
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' |