diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-25 22:37:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-25 22:37:48 +0000 |
| commit | d3eb84c56d591ef1b63b1f0343c481b8a08470b5 (patch) | |
| tree | 058f477422a5f4ebf71f34258d7a602a52030a45 | |
| parent | f05750d23696a253a34a83a4b6f3e1fa38eb6b31 (diff) | |
| parent | 679a507f6e65f308eb5658b6414061b2ae2b9533 (diff) | |
| download | kolla-d3eb84c56d591ef1b63b1f0343c481b8a08470b5.tar.gz kolla-d3eb84c56d591ef1b63b1f0343c481b8a08470b5.zip | |
Merge "Add ceph fs containers"4.0.0.0b3
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-mds/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/ceph/cephfs-fuse/Dockerfile.j2 | 11 |
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 [] |