From 2fdd7e4dddceac3bde83e8d463854179a550ef42 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Thu, 21 Apr 2016 17:10:12 +0530
Subject: [PATCH] Update designate dockerfile for formatting

Change-Id: I6d87fd19db433023d3d466e21e6dff27d7bf3927
Partial-Bug:#1569417
---
 docker/designate/designate-api/Dockerfile.j2           | 2 +-
 docker/designate/designate-backend-bind9/Dockerfile.j2 | 3 ++-
 docker/designate/designate-base/Dockerfile.j2          | 2 +-
 docker/designate/designate-central/Dockerfile.j2       | 3 ++-
 docker/designate/designate-mdns/Dockerfile.j2          | 3 ++-
 docker/designate/designate-poolmanager/Dockerfile.j2   | 6 +++---
 docker/designate/designate-sink/Dockerfile.j2          | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 0f20163caa..df26862cfd 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/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-designate-api \
     && yum clean all
 
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 6ed56cb7a3..5508fb16fb 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum install -y bind \
+RUN yum -y install \
+        bind \
     && yum clean all \
     && mkdir -p /var/lib/kolla/ \
     && cp -pr /var/named /var/lib/kolla/var-named
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 4aec9796c0..160642cd1f 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 # is needed in all services. This is probably a packaging bug. We do
 # need the complete policy file because of some of the containers'
 # requiring it. Remove the package when the file is moved though.
-RUN yum install -y \
+RUN yum -y install \
         openstack-designate-api \
         openstack-designate-common \
         python-tooz \
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index dfd67978ed..9828da3fa2 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-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-designate-central \
+RUN yum -y install \
+        openstack-designate-central \
     && yum clean all
 
     {% elif base_distro in ['ubuntu']%}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 2ed4386af5..f8e1270d41 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/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-designate-mdns \
+RUN yum -y install \
+        openstack-designate-mdns \
     && yum clean all
 
     {% elif base_distro in ['ubuntu'] %}
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index 9cad51c89e..8e3d682127 100644
--- a/docker/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -5,16 +5,16 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 # The bind9 package here is only to provide the rndc binary.
-RUN yum install -y \
-        openstack-designate-pool-manager \
+RUN yum -y install \
         bind \
+        openstack-designate-pool-manager \
     && yum clean all
 
     {% elif base_distro in ['ubuntu'] %}
 
 RUN apt-get install -y --no-install-recommends \
-        designate-pool-manager \
         bind9 \
+        designate-pool-manager \
     && apt-get clean
 
     {% endif %}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 0c882ceb9b..daa271266d 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/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-designate-sink \
         python-designateclient \
     && yum clean all