summaryrefslogtreecommitdiff
path: root/docker/ceilometer
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-06-05 17:16:49 +0100
committerMark Goddard <mark@stackhpc.com>2019-06-07 17:59:49 +0000
commitb71f2be433568e6c71ea1d54a92dfa6a449dead6 (patch)
treef6df8519175dc8b1e4790b3da4c1095db3d20243 /docker/ceilometer
parentc5d2e9683d8c26e382356a1c1b6d431e78e0f398 (diff)
downloadkolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.tar.gz
kolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.zip
Debian/Ubuntu: more python3 packages for binary
backport: Stein During the switch to Stein UCA, we did not switch all packages to python 3 for Debian/Ubuntu binary images. This change switches some more of those packages. Change-Id: I0bff21384d88ea678608392de2db1ba418c96665 Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> (cherry picked from commit aa59f0db6f88ed0a03169b473fdf6d541d34df9f)
Diffstat (limited to 'docker/ceilometer')
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile.j24
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile.j22
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 e8ae32dcf..ee899bde1 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")) }}