From b103210a86dfafbaf9e10d114d27acf5c3c319aa Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Wed, 30 Oct 2019 09:43:23 +0100
Subject: [PATCH] Add xfsprogs to nova-compute

xfsprogs is required for formatting XFS ephemeral disk partitions
when format=xfs is specified as instance create failes with
'mkfs.xfs: No such file or directory' due to missing xfsprogs
package in the nova-compute container.

Closes-Bug: #1850610

Conflicts:
      docker/nova/nova-compute/Dockerfile.j2

Change-Id: Iaf3414464f3dd747427247339c6b201b352063cb
(cherry picked from commit 9b1a243a3a1669532f25bbdcbc56b78f0f72882c)
(cherry picked from commit 23e488dfe73a9273698f2a33d8b74f770d9a83f6)
(cherry picked from commit f0705fcfbd38564d3cb2efa666a67e6b7b757d18)
---
 docker/nova/nova-compute/Dockerfile.j2 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index d3d711f5b1..14220716fd 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -22,7 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-oslo-vmware',
             'python-rtslib',
             'sysfsutils',
-            'targetcli'
+            'targetcli',
+            'xfsprogs'
         ] %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -44,7 +45,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-guestfs',
             'python-ironicclient',
             'python-oslo.vmware',
-            'sysfsutils'
+            'sysfsutils',
+            'xfsprogs'
         ] %}
 
         # Debian/stretch uses rtslib-fb (like CentOS does)
@@ -86,7 +88,8 @@ RUN rm -f /etc/nova/nova-compute.conf
             'python-rtslib',
             'qemu-img',
             'sysfsutils',
-            'targetcli'
+            'targetcli',
+            'xfsprogs'
         ] %}
 
     {% elif base_distro in ['debian', 'ubuntu'] %}
@@ -103,7 +106,8 @@ RUN rm -f /etc/nova/nova-compute.conf
             'parted',
             'python-guestfs',
             'python-libvirt',
-            'qemu-utils'
+            'qemu-utils',
+            'xfsprogs'
         ] %}
 
         {% if base_arch == "aarch64" %}