diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:09 +0000 |
| commit | 17ce7d4de63273a0beca972b5f3cea1a0b62c928 (patch) | |
| tree | 891c4ca26e98910e327ab2183a7ce188d0fcf342 /docker/ceilometer | |
| parent | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (diff) | |
| parent | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (diff) | |
| download | kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.tar.gz kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.zip | |
Merge "Debian/Ubuntu: more python3 packages for binary"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 4b004c945..10c838215 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -30,9 +30,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set ceilometer_base_packages = [ 'ceilometer-common', - 'python-gnocchiclient', + 'python3-gnocchiclient', 'python3-panko', - 'python-pymongo' + 'python3-pymongo' ] %} {% endif %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index d4d238b18..e587ad861 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set ceilometer_compute_packages = [ 'ceilometer-agent-compute', - 'python-libvirt' + 'python3-libvirt' ] %} {% endif %} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} |