From 2a19d8e6e30176edfe6a48af79c7fe54e7829124 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 12 Apr 2016 21:37:56 +0530
Subject: [PATCH] Update Magnum dockerfiles for formatting

Change-Id: Ieaad94d423d58b153bbf7f634be44a0e48ac775f
Partial-Bug:#1569417
---
 docker/magnum/magnum-api/Dockerfile.j2       | 3 ++-
 docker/magnum/magnum-base/Dockerfile.j2      | 3 ++-
 docker/magnum/magnum-conductor/Dockerfile.j2 | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index 4df7ee911a..beeed5d7fb 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install openstack-magnum-api \
+RUN yum -y install \
+        openstack-magnum-api \
     && yum clean all
 
     {% endif %}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 193b036881..dbb66ddedf 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -5,7 +5,8 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
 
 RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo \
-    && yum install -y openstack-magnum-common \
+    && yum -y install \
+           openstack-magnum-common \
     && yum clean all
 
     {% endif %}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index d753e01a22..d0312f22d3 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -10,7 +10,11 @@ RUN yum -y install \
     && yum clean all
 
 # Install kubectl binary (ugh)
-RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
+RUN cd /tmp \
+    && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \
+    && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz \
+    && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \
+    && rm -rf /tmp/kubernetes
 
     {% endif %}
 {% endif %}