Merge "Ceilometer ubuntu binary container"

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 %}
 

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' %}

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 %}
 

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 %}
 

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 %}
 

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 %}