diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-04 10:39:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-04 10:39:19 +0000 |
| commit | 5caa5e30de05f5879fe56c3b0cb56329c8116d87 (patch) | |
| tree | fb48538e55cee16d6211f00b1f9aa2384d63eec7 /docker/ceph | |
| parent | 9ef9cbeb8f3504a4d80716e5e6ae7e9e6bb372d6 (diff) | |
| parent | 14374e715d2a5057a28126c7193cfb6270eabaab (diff) | |
| download | kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.tar.gz kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.zip | |
Merge "Bump Ubuntu base image to 18.04"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-nfs/Dockerfile.j2 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/ceph/ceph-nfs/Dockerfile.j2 b/docker/ceph/ceph-nfs/Dockerfile.j2 index a657a9d4a..e34429ddf 100644 --- a/docker/ceph/ceph-nfs/Dockerfile.j2 +++ b/docker/ceph/ceph-nfs/Dockerfile.j2 @@ -9,14 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ceph_nfs_packages = [ 'nfs-ganesha', - 'nfs-ganesha-ceph', - 'nfs-ganesha-rgw' + 'nfs-ganesha-ceph' ] %} {% elif base_distro in ['ubuntu'] %} {% set ceph_nfs_packages = [ 'nfs-ganesha', - 'nfs-ganesha-ceph', - 'nfs-ganesha-rgw' + 'nfs-ganesha-ceph' ] %} {% endif %} |