From d14666a51d9fa0fc14d87e46c565c2afaee4d81e Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Mon, 23 Nov 2015 22:42:57 +0530 Subject: [PATCH] Update ceilometer dockerfiles Updated ceilometer-base dockerfile to include commons package Change-Id: Ieff651f0b7e9716b1b73e2e192f22e2e39dbe5a6 Closes-Bug:#1484002 --- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 9e85466631..3c8929a0a5 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 \