summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-12 20:57:37 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-12 20:57:37 +0530
commit970075d49a827770963e6c98a3978fe1a73d1f6b (patch)
treec73835cb733ea08e74e715568123d047319daafb /docker
parent3f9f267a42ea2dcd09a946dc024e68f9b70d930c (diff)
downloadkolla-970075d49a827770963e6c98a3978fe1a73d1f6b.tar.gz
kolla-970075d49a827770963e6c98a3978fe1a73d1f6b.zip
Update Ceilometer dockerfiles for formatting
Change-Id: If5ead9a476a9fede105b328d7ba7422b45eae8a7 Partial-Bug:#1569417
Diffstat (limited to 'docker')
-rw-r--r--docker/ceilometer/ceilometer-api/Dockerfile.j23
-rw-r--r--docker/ceilometer/ceilometer-central/Dockerfile.j23
-rw-r--r--docker/ceilometer/ceilometer-collector/Dockerfile.j23
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile.j22
-rw-r--r--docker/ceilometer/ceilometer-notification/Dockerfile.j23
5 files changed, 9 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index 921e57ee8..668226109 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/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'] %}
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index a34f80163..44dae4004 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/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'] %}
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index 485119a20..5bf0e9a2d 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/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'] %}
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 5837e9211..90933e06e 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/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
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index cc699e043..7546f0f5a 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/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'] %}