openstack
/
kolla
Code Issues Proposed changes

Merge "Add ceph fs containers"

This commit is contained in:
Jenkins 2017-01-25 22:37:48 +00:00 committed by Gerrit Code Review
parent f05750d236 679a507f6e
commit d3eb84c56d
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -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',

7
docker/ceph/ceph-mds/Dockerfile.j2 Normal file
View File

@ -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 %}

11
docker/ceph/cephfs-fuse/Dockerfile.j2 Normal file
View File

@ -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 []