From 970075d49a827770963e6c98a3978fe1a73d1f6b Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 12 Apr 2016 20:57:37 +0530
Subject: [PATCH] Update Ceilometer dockerfiles for formatting

Change-Id: If5ead9a476a9fede105b328d7ba7422b45eae8a7
Partial-Bug:#1569417
---
 docker/ceilometer/ceilometer-api/Dockerfile.j2          | 3 ++-
 docker/ceilometer/ceilometer-central/Dockerfile.j2      | 3 ++-
 docker/ceilometer/ceilometer-collector/Dockerfile.j2    | 3 ++-
 docker/ceilometer/ceilometer-compute/Dockerfile.j2      | 2 +-
 docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index 921e57ee82..6682261099 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 a34f801632..44dae40043 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 485119a20e..5bf0e9a2dd 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 5837e92116..90933e06e8 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 cc699e043a..7546f0f5a7 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'] %}