From 7a6edb57976eebdaa8dc9a4affe39f1ca25173fd Mon Sep 17 00:00:00 2001
From: MD NADEEM <mail2nadeem92@gmail.com>
Date: Mon, 8 Feb 2016 11:06:11 +0530
Subject: [PATCH] Ceilometer ubuntu binary container
Change-Id: I653b6b994de2f4d374d90a831d7a56eaff667404
Partially-Implements: blueprint binary-ubuntu
---
docker/ceilometer/ceilometer-api/Dockerfile.j2 | 6 ++++++
docker/ceilometer/ceilometer-base/Dockerfile.j2 | 6 ++++++
docker/ceilometer/ceilometer-central/Dockerfile.j2 | 6 ++++++
docker/ceilometer/ceilometer-collector/Dockerfile.j2 | 6 ++++++
docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 8 +++++++-
docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 6 ++++++
6 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index fabc4ffa6c..921e57ee82 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-ceilometer-api \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-api \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 3d34b370ed..70d9f87d48 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' %}
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index a7598c7421..a34f801632 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-ceilometer-central \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-agent-central \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index ee28fa2504..485119a20e 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-ceilometer-collector \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-collector \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index f77d93d9d9..5837e92116 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -7,9 +7,15 @@ MAINTAINER {{ maintainer }}
RUN yum install -y \
openstack-ceilometer-compute \
python-ceilometerclient \
- python-pecan \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-agent-compute \
+ python-ceilometerclient \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index d00d5a543e..cc699e043a 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-ceilometer-notification \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ ceilometer-agent-notification \
+ && apt-get clean
+
{% endif %}
{% endif %}