diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-21 04:46:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-21 04:46:04 +0000 |
| commit | e2666505a68875856c1785a5a7e18480c75eebc3 (patch) | |
| tree | 14024b0ce60a11cb96ce6fb187803b58f1b327ac | |
| parent | 9ce572a3a872ebb4ee251439206769429d2fa379 (diff) | |
| parent | d69cc8e88bb46b7e445cea94d399d549d6f85fd1 (diff) | |
| download | kolla-e2666505a68875856c1785a5a7e18480c75eebc3.tar.gz kolla-e2666505a68875856c1785a5a7e18480c75eebc3.zip | |
Merge "Add ceph-nfs container"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/nfs_ganesha.repo | 5 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/ceph/ceph-nfs/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | releasenotes/notes/add-ceph-nfs-b64cfba4775589a0.yaml | 4 |
5 files changed, 43 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 20f91a7c8..2b4b67641 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -66,6 +66,7 @@ COPY yum.conf /etc/yum.conf 'influxdb.repo', 'kibana.yum.repo', 'MariaDB.repo', + 'nfs_ganesha.repo', 'opendaylight.repo', 'sensu.repo', 'td.repo', diff --git a/docker/base/nfs_ganesha.repo b/docker/base/nfs_ganesha.repo new file mode 100644 index 000000000..ea0d0f07f --- /dev/null +++ b/docker/base/nfs_ganesha.repo @@ -0,0 +1,5 @@ +[nfs_ganesha] +baseurl = http://download.ceph.com/nfs-ganesha/rpm-V2.5-stable/luminous/$basearch +gpgcheck = 1 +gpgkey = https://download.ceph.com/keys/release.asc +name = nfs-ganesha stable repo diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 74399f854..59f9ebf27 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -33,6 +33,9 @@ deb https://repos.influxdata.com/ubuntu xenial stable # Grafana repo deb https://packagecloud.io/grafana/stable/debian/ jessie main +# Nfs-ganesha repo +deb http://download.ceph.com/nfs-ganesha/deb-V2.5-stable/luminous xenial main + # Fluentd repo deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib diff --git a/docker/ceph/ceph-nfs/Dockerfile.j2 b/docker/ceph/ceph-nfs/Dockerfile.j2 new file mode 100644 index 000000000..a657a9d4a --- /dev/null +++ b/docker/ceph/ceph-nfs/Dockerfile.j2 @@ -0,0 +1,30 @@ +FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block ceph_nfs_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set ceph_nfs_packages = [ + 'nfs-ganesha', + 'nfs-ganesha-ceph', + 'nfs-ganesha-rgw' + ] %} +{% elif base_distro in ['ubuntu'] %} + {% set ceph_nfs_packages = [ + 'nfs-ganesha', + 'nfs-ganesha-ceph', + 'nfs-ganesha-rgw' + ] %} + +{% endif %} + +{{ macros.install_packages(ceph_nfs_packages | customizable("packages")) }} + + +{% block ceph_nfs_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER ceph diff --git a/releasenotes/notes/add-ceph-nfs-b64cfba4775589a0.yaml b/releasenotes/notes/add-ceph-nfs-b64cfba4775589a0.yaml new file mode 100644 index 000000000..a527e60a8 --- /dev/null +++ b/releasenotes/notes/add-ceph-nfs-b64cfba4775589a0.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add ceph-nfs dockerfile |