aboutsummaryrefslogtreecommitdiff
path: root/docker/ceph
diff options
context:
space:
mode:
authorKevin Fox <kevin@efox.cc>2017-01-19 17:11:45 -0800
committerKevin Fox <kevin@efox.cc>2017-01-23 11:34:23 -0800
commit679a507f6e65f308eb5658b6414061b2ae2b9533 (patch)
tree6138f7a4f1841edc8edce66c4c91ff0c2104230b /docker/ceph
parentb08f2cc60ef7f4a0a8a9828d2ff1cf2fc44beaf9 (diff)
downloadkolla-679a507f6e65f308eb5658b6414061b2ae2b9533.tar.gz
kolla-679a507f6e65f308eb5658b6414061b2ae2b9533.zip
Add ceph fs containers
This PS adds containers for cephfs support. Including the ceph-mds and fuse cephfs filesystem. Change-Id: Ie270d6bbe08b608cfdba1bc378e9624f7fb3e791
Diffstat (limited to 'docker/ceph')
-rw-r--r--docker/ceph/ceph-base/Dockerfile.j22
-rw-r--r--docker/ceph/ceph-mds/Dockerfile.j27
-rw-r--r--docker/ceph/cephfs-fuse/Dockerfile.j211
3 files changed, 20 insertions, 0 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index 4b573a310..9b53abd4d 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -10,6 +10,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceph_base_packages = [
'ceph',
+ 'ceph-fuse',
'ceph-radosgw',
'parted',
'hdparm',
@@ -20,6 +21,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ceph_base_packages = [
'ceph',
+ 'ceph-fuse',
'radosgw',
'parted',
'hdparm',
diff --git a/docker/ceph/ceph-mds/Dockerfile.j2 b/docker/ceph/ceph-mds/Dockerfile.j2
new file mode 100644
index 000000000..61c64fba0
--- /dev/null
+++ b/docker/ceph/ceph-mds/Dockerfile.j2
@@ -0,0 +1,7 @@
+FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block ceph_mds_header %}{% endblock %}
+
+{% block ceph_mds_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/docker/ceph/cephfs-fuse/Dockerfile.j2 b/docker/ceph/cephfs-fuse/Dockerfile.j2
new file mode 100644
index 000000000..d738a73dd
--- /dev/null
+++ b/docker/ceph/cephfs-fuse/Dockerfile.j2
@@ -0,0 +1,11 @@
+FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block cephfs_fuse_header %}{% endblock %}
+
+{% block cephfs_fuse_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT ["/usr/bin/ceph-fuse"]
+CMD []