openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Ceilometer dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 07:48:23 +00:00 committed by Gerrit Code Review
commit c7ea6aa13e
5 changed files with 9 additions and 5 deletions
docker/ceilometer
ceilometer-api
Dockerfile.j2
ceilometer-central
Dockerfile.j2
ceilometer-collector
Dockerfile.j2
ceilometer-compute
Dockerfile.j2
ceilometer-notification
Dockerfile.j2

3
docker/ceilometer/ceilometer-api/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-ceilometer-api \
RUN yum -y install \
openstack-ceilometer-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

3
docker/ceilometer/ceilometer-central/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-ceilometer-central \
RUN yum -y install \
openstack-ceilometer-central \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

3
docker/ceilometer/ceilometer-collector/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-ceilometer-collector \
RUN yum -y install \
openstack-ceilometer-collector \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

2
docker/ceilometer/ceilometer-compute/Dockerfile.j2

@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y \
RUN yum -y install \
openstack-ceilometer-compute \
python-ceilometerclient \
&& yum clean all

3
docker/ceilometer/ceilometer-notification/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-ceilometer-notification \
RUN yum -y install \
openstack-ceilometer-notification \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}