aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-06 09:59:59 +0000
committerGerrit Code Review <review@openstack.org>2017-01-06 09:59:59 +0000
commitae1cf2c88da6f467bb92e5360ec26d91146d1849 (patch)
treeb7a0252d76eb4daab7a6e0fafb119f6479c06e84
parent413fd2cb5c94b49b58848603b2a9a091cb67b04a (diff)
parent1a6a952f781fffd943bb5d0c9a869d35bdf3ebe3 (diff)
downloadkolla-ae1cf2c88da6f467bb92e5360ec26d91146d1849.tar.gz
kolla-ae1cf2c88da6f467bb92e5360ec26d91146d1849.zip
Merge "Add python-gnocchiclient to ceilomter base image"
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 7dc0e4e6c..99e82c0d3 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -9,12 +9,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_base_packages = [
'openstack-ceilometer-common',
+ 'python-gnocchiclient',
'python-tooz',
'python-oslo-db'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set ceilometer_base_packages = [
'ceilometer-common',
+ 'python-gnocchiclient',
'python-pymongo'
] %}
{% endif %}