aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2015-11-23 22:42:57 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2015-11-23 22:43:42 +0530
commitd14666a51d9fa0fc14d87e46c565c2afaee4d81e (patch)
tree0f61839c4abca71a025209448806edfb3fe381b8
parent7f2d46278f2570fc18f5871ebc4f6433acec98a9 (diff)
downloadkolla-d14666a51d9fa0fc14d87e46c565c2afaee4d81e.tar.gz
kolla-d14666a51d9fa0fc14d87e46c565c2afaee4d81e.zip
Update ceilometer dockerfiles
Updated ceilometer-base dockerfile to include commons package Change-Id: Ieff651f0b7e9716b1b73e2e192f22e2e39dbe5a6 Closes-Bug:#1484002
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile.j211
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 9e8546663..3c8929a0a 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -1,7 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
-{% if install_type == 'source' %}
+{% if install_type == 'binary' %}
+ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+ openstack-ceilometer-common \
+ && yum clean all
+
+ {% endif %}
+
+{% elif install_type == 'source' %}
ADD ceilometer-base-archive /ceilometer-base-source
RUN ln -s ceilometer-base-source/* ceilometer \