From 5244d7e21d1aed2200297c807c6ecf4ddf3dbc62 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 29 Jun 2017 12:11:26 +0100
Subject: [PATCH] Add e2fsprogs and xfsprogs to ironic-conductor

These are required for formatting ext and XFS ephemeral disk partitions
when using the iSCSI deployment drivers.

Change-Id: Icd187cdd1eb0cb36fbda6c04304bd25d31199bd7
Closes-Bug: #1701320
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 7dbcbc54a6..3fce160175 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         # python-seamicroclient, pyremotevbox package
         {% set ironic_conductor_packages = [
             'dosfstools',
+            'e2fsprogs',
             'gdisk',
             'ipmitool',
             'openstack-ironic-conductor',
@@ -27,7 +28,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'qemu-img',
             'shellinabox',
             'socat',
-            'util-linux'
+            'util-linux',
+            'xfsprogs',
         ] %}
     {% elif base_distro in ['debian', 'ubuntu'] %}
         # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
@@ -35,6 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set ironic_conductor_packages = [
             'bsdmainutils',
             'dosfstools',
+            'e2fsprogs',
             'gdisk',
             'ipmitool',
             'ironic-conductor',
@@ -49,13 +52,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-seamicroclient',
             'qemu-utils',
             'shellinabox',
-            'socat'
+            'socat',
+            'xfsprogs',
         ] %}
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set ironic_conductor_packages = [
             'dosfstools',
+            'e2fsprogs',
             'fuse',
             'gdisk',
             'ipmitool',
@@ -64,19 +69,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'qemu-img',
             'shellinabox',
             'socat',
-            'util-linux'
+            'util-linux',
+            'xfsprogs',
         ] %}
     {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set ironic_conductor_packages = [
             'bsdmainutils',
             'dosfstools',
+            'e2fsprogs',
             'gdisk',
             'ipmitool',
             'parted',
             'psmisc',
             'qemu-utils',
             'shellinabox',
-            'socat'
+            'socat',
+            'xfsprogs',
         ] %}
     {% endif %}