diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 08:49:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 08:49:53 +0000 |
| commit | ffc5e11d93a532829e174a93d3c493c7f28bc330 (patch) | |
| tree | a052db7963af31b489d808381540c2647cb7b494 | |
| parent | f36d1c58661c75fe05e428168a947176896e52ba (diff) | |
| parent | 62bffa7436e7481c72d0fb2b2f27f5f54016a8ed (diff) | |
| download | kolla-ffc5e11d93a532829e174a93d3c493c7f28bc330.tar.gz kolla-ffc5e11d93a532829e174a93d3c493c7f28bc330.zip | |
Merge "Update Cinder dockerfiles for formatting"
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
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 |