diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/ceilometer | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 12 |
2 files changed, 4 insertions, 21 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 331a9d203..23a35a1cc 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -12,23 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set ceilometer_base_packages = [ - 'openstack-ceilometer-common' - ] %} - {% if distro_python_version.startswith('3') %} - {% set ceilometer_base_packages = ceilometer_base_packages + [ + 'openstack-ceilometer-common', 'python3-gnocchiclient', 'python3-oslo-db', 'python3-panko', 'python3-tooz' ] %} - {% else %} - {% set ceilometer_base_packages = ceilometer_base_packages + [ - 'python-gnocchiclient', - 'python-oslo-db', - 'python-panko', - 'python-tooz' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set ceilometer_base_packages = [ 'ceilometer-common', diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index ec6239803..a02e99fdb 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -22,15 +22,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} - {% if distro_python_version.startswith('3') %} - {% set ceilometer_compute_packages = [ - 'python3-libvirt' - ] %} - {% else %} - {% set ceilometer_compute_packages = [ - 'libvirt-python' - ] %} - {% endif %} + {% set ceilometer_compute_packages = [ + 'python3-libvirt' + ] %} {% elif base_package_type == 'deb' %} {% set ceilometer_compute_packages = [ 'python3-libvirt' |