openstack
/
kolla
Code Issues Proposed changes

Updated Gnocchi binary containers 

Added ubuntu binary containers
Added gnocchi-metricd which is new package in centos
and ubuntu

Change-Id: If21d705e8bd1e34ea894c83ae42b0c8ef20510d7
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582523
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2016-05-17 10:52:24 +05:30
parent 40cd7550dd
commit 5026e976e6
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -10,6 +10,12 @@ RUN yum -y install \
openstack-gnocchi-indexer-sqlalchemy \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
gnocchi-api \
&& apt-get clean
{% endif %}
{% endif %}

9
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -8,11 +8,18 @@ RUN yum -y install \
openstack-gnocchi-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
gnocchi-common \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends libpq-dev \
RUN apt-get -y install --no-install-recommends \
libpq-dev \
&& apt-get clean
{% endif %}

22
docker/gnocchi/gnocchi-metricd/Dockerfile.j2 Normal file
View File

@ -0,0 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-gnocchi-metricd \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
gnocchi-metricd \
&& apt-get clean
{% endif %}
{% endif %}
{{ include_footer }}
USER gnocchi