aboutsummaryrefslogtreecommitdiff
path: root/docker/ceph
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2017-04-22 08:20:43 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2017-04-24 14:06:24 +0200
commita2448f4933af9e85e65990841cd6fa6b08a63d7d (patch)
tree6abaea214e70a18b6de7ab214bbb1fa22304ef53 /docker/ceph
parent6a9681ba9b6a9581a0ac18a56a176aab13f9f55a (diff)
downloadkolla-a2448f4933af9e85e65990841cd6fa6b08a63d7d.tar.gz
kolla-a2448f4933af9e85e65990841cd6fa6b08a63d7d.zip
ceph: take care of ceph-fuse package availability
'ceph-fuse' package is not available for all architectures. In Debian/Ubuntu 'ceph-fuse' package is built only for x86_64 architecture. CentOS lacks 'ppc64le' package. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I06cea15166bee77dca7b418e85d3a4080892068e
Diffstat (limited to 'docker/ceph')
-rw-r--r--docker/ceph/ceph-base/Dockerfile.j218
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")) }}