From 0efd4e25677979cf412846e5327698f31e86d9fb Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 12 Apr 2016 22:08:02 +0530
Subject: [PATCH] Update Trove dockerfiles for formatting
Change-Id: Ia3fef63d4aae1a342f376cd9653a2fe4a820aa7e
Partial-Bug:#1569417
---
docker/trove/trove-api/Dockerfile.j2 | 3 ++-
docker/trove/trove-conductor/Dockerfile.j2 | 3 ++-
docker/trove/trove-guestagent/Dockerfile.j2 | 3 ++-
docker/trove/trove-taskmanager/Dockerfile.j2 | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index 93bcf9ffed..bf6da5291d 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-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-trove-api \
+RUN yum -y install \
+ openstack-trove-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index 63efeb212c..0816c35c98 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/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-trove-conductor \
+RUN yum -y install \
+ openstack-trove-conductor \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index 8bfea68e70..65770560e2 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/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-trove-guestagent \
+RUN yum -y install \
+ openstack-trove-guestagent \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index e5bb1e4ba4..025241a610 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/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-trove-taskmanager \
+RUN yum -y install \
+ openstack-trove-taskmanager \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}