openstack/kolla
Code Issues Proposed changes

ceph-base/dind: switch to btrfs-progs package

Browse Source 
Starting with 4.4.1 release btrfs-tools were renamed to btrfs-progs so
*-tools package became transitional one.

Next stable Debian release will not have 'btrfs-tools' package at all.

Change-Id: I188eaad233c1dbdbfd1c115e02b0e1c66e307c20
This commit is contained in:
Marcin Juszkiewicz 2018-10-23 12:29:15 +02:00 committed by Marcin Juszkiewicz
parent f613ff8a54
commit 96b6e4e1db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceph_base_packages = [ {% set ceph_base_packages = [
'btrfs-tools', 'btrfs-progs',
'ceph', 'ceph',
'ceph-mds', 'ceph-mds',
'e2fsprogs', 'e2fsprogs',

2
docker/dind/Dockerfile.j2
View File

@ -14,7 +14,7 @@ RUN /bin/true
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set dind_packages = [ {% set dind_packages = [
'btrfs-tools', 'btrfs-progs',
'openssh-server' 'openssh-server'
] %} ] %}