diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 10:58:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 10:58:08 +0000 |
| commit | 0545701d0d4bfda60a5e4459a6bd3ef58887075b (patch) | |
| tree | e6cff85ddc427a059a5a1efb17a276f1cfc7f0fe /docker/glance | |
| parent | e47d4b8506e990c3f466676a1108de1d1b7ece40 (diff) | |
| parent | 1353538644253081f62a6a74e299d102aa9965dd (diff) | |
| download | kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.tar.gz kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.zip | |
Merge "Make Ceph work for RPM based distributions"
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index bf079c528..3ca7e5133 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -9,11 +9,22 @@ RUN yum -y install \ python-oslo-i18n \ python-castellan \ python-cryptography \ - && yum clean all + python-rbd \ + python-rados \ + && yum clean all \ + && mkdir -p /etc/ceph/ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['ubuntu', 'debian'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + python-rbd \ + python-rados \ + && yum clean all \ + && mkdir -p /etc/ceph/ + + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ python-rbd \ |