aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-12 21:10:02 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-13 08:01:19 +0530
commit62bffa7436e7481c72d0fb2b2f27f5f54016a8ed (patch)
tree46534fe88602918c4813c379cbb1e543669bc42a /docker
parent544c00b4975d86b1d4a6a5cd5b923073c99d1ece (diff)
downloadkolla-62bffa7436e7481c72d0fb2b2f27f5f54016a8ed.tar.gz
kolla-62bffa7436e7481c72d0fb2b2f27f5f54016a8ed.zip
Update Cinder dockerfiles for formatting
Change-Id: I73a97fa7b7f4a38aea778d9e7e482f35e22c62a8 Partial-Bug:#1569417
Diffstat (limited to 'docker')
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j23
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j23
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j22
3 files changed, 5 insertions, 3 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 60c69a7c5..c299c81f1 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-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 python-keystone \
+RUN yum -y install \
+ python-keystone \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 46eddd25e..50d243dac 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/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-cinder \
+RUN yum -y install \
+ openstack-cinder \
python-automaton \
lvm2 \
ceph-common \
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 66fa38d56..35e5820e9 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y \
+RUN yum -y install \
scsi-target-utils \
&& yum clean all