diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-29 08:01:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-29 08:01:15 +0000 |
| commit | 63fd805c22289ce83686b6599df3702a270445fa (patch) | |
| tree | 2cbd1b32b2247a2e2f0ceaf0941c946b5204dee0 | |
| parent | 6ac53469542af78f90d29977b7617224b2e8c50b (diff) | |
| parent | 96b6e4e1dbeb76769adae7c0bd855ffce49b6cf1 (diff) | |
| download | kolla-63fd805c22289ce83686b6599df3702a270445fa.tar.gz kolla-63fd805c22289ce83686b6599df3702a270445fa.zip | |
Merge "ceph-base/dind: switch to btrfs-progs package"
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index ad1a3ff42..084693a1d 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -28,7 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_distro in ['debian', 'ubuntu'] %} {% set ceph_base_packages = [ - 'btrfs-tools', + 'btrfs-progs', 'ceph', 'ceph-mds', 'e2fsprogs', diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 9f70211a1..791ba5b89 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -14,7 +14,7 @@ RUN /bin/true {% elif base_distro in ['debian', 'ubuntu'] %} {% set dind_packages = [ - 'btrfs-tools', + 'btrfs-progs', 'openssh-server' ] %} |