From 96b6e4e1dbeb76769adae7c0bd855ffce49b6cf1 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Tue, 23 Oct 2018 12:29:15 +0200
Subject: [PATCH] ceph-base/dind: switch to btrfs-progs package

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
---
 docker/ceph/ceph-base/Dockerfile.j2 | 2 +-
 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 ad1a3ff42c..084693a1dc 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 9f70211a10..791ba5b890 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'
     ] %}