diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-25 18:10:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-25 18:10:05 +0000 |
| commit | 4d35a7671aa7b77e8e4f06d377dd11033255f28b (patch) | |
| tree | 6d800078269c84e46dc7f8bb9559511f1729771c /docker | |
| parent | ec50a83c90eacc50d1c5ae13708b1af3cd1e1e3a (diff) | |
| parent | a2448f4933af9e85e65990841cd6fa6b08a63d7d (diff) | |
| download | kolla-4d35a7671aa7b77e8e4f06d377dd11033255f28b.tar.gz kolla-4d35a7671aa7b77e8e4f06d377dd11033255f28b.zip | |
Merge "ceph: take care of ceph-fuse package availability"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 629874843..a016a655c 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -8,27 +8,41 @@ LABEL maintainer="{{ maintainer }}" {{ macros.configure_user(name='ceph') }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set ceph_base_packages = [ 'btrfs-progs', 'ceph', - 'ceph-fuse', 'ceph-radosgw', 'e2fsprogs', 'hdparm', 'parted', 'xfsprogs' ] %} + + {% if base_arch in ['aarch64', 'x86_64'] %} + {% set ceph_base_packages = ceph_base_packages + [ + 'ceph-fuse' + ] %} + {% endif %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set ceph_base_packages = [ 'btrfs-tools', 'ceph', - 'ceph-fuse', 'e2fsprogs', 'hdparm', 'parted', 'radosgw', 'xfsprogs' ] %} + + {% if base_arch in ['x86_64'] %} + {% set ceph_base_packages = ceph_base_packages + [ + 'ceph-fuse' + ] %} + {% endif %} + {% endif %} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }} |