aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-18 17:10:21 +0000
committerGerrit Code Review <review@openstack.org>2016-02-18 17:10:21 +0000
commitca60b3ee5f587b37579571314c256382462cecf8 (patch)
tree3f46e275fa13065af3a0c4be3328109f7988d34f /docker/ceilometer/ceilometer-base
parent37b3e8b6784fd8d01816ecc00d970ff59af3be33 (diff)
parent7a6edb57976eebdaa8dc9a4affe39f1ca25173fd (diff)
downloadkolla-ca60b3ee5f587b37579571314c256382462cecf8.tar.gz
kolla-ca60b3ee5f587b37579571314c256382462cecf8.zip
Merge "Ceilometer ubuntu binary container"
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 1d1965d9e..dd466fac3 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -8,6 +8,12 @@ RUN yum -y install \
openstack-ceilometer-common \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-common \
+ && apt-get clean
+
{% endif %}
{% elif install_type == 'source' %}