diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-18 16:38:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-18 16:38:59 +0000 |
| commit | 37b3e8b6784fd8d01816ecc00d970ff59af3be33 (patch) | |
| tree | 55deb7b76dca71148363e5a872526a72f69dab58 /docker | |
| parent | 457ce3301ef2cddccd5af067e164b545f14e590e (diff) | |
| parent | a71c9cbacd2372201059d6d309f4593ae92a4d46 (diff) | |
| download | kolla-37b3e8b6784fd8d01816ecc00d970ff59af3be33.tar.gz kolla-37b3e8b6784fd8d01816ecc00d970ff59af3be33.zip | |
Merge "Fix missing ceph-common package in cinder"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index b8ba16df2..41b33922d 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -5,11 +5,11 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-cinder \ - python-automaton \ - lvm2 \ - ceph-common \ - && yum clean all \ - && mkdir -p /etc/ceph + python-automaton \ + lvm2 \ + ceph-common \ + && yum clean all \ + && mkdir -p /etc/ceph {% elif base_distro in ['ubuntu'] %} @@ -27,6 +27,7 @@ RUN apt-get install -y --no-install-recommends \ RUN yum -y install \ lvm2 \ qemu-img \ + ceph-common \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} |