Merge "Add mtools package to ironic-conductor image"

Author: Zuul

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -13,7 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'e2fsprogs',
         'fuse',
         'gdisk',
+        'genisoimage',
         'ipmitool',
+        'mtools',
         'openssh-clients',
         'parted',
         'psmisc',
@@ -22,7 +24,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'systemd-udev',
         'util-linux',
         'xfsprogs',
-        'genisoimage',
     ] %}
     {% if base_arch in ['x86_64'] %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
@@ -35,7 +36,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'dosfstools',
         'e2fsprogs',
         'gdisk',
+        'genisoimage',
         'ipmitool',
+        'isolinux',
+        'mtools',
         'openssh-client',
         'parted',
         'psmisc',
@@ -44,8 +48,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'shellinabox',
         'udev',
         'xfsprogs',
-        'genisoimage',
-        'isolinux',
     ] %}
 {% endif %}
 

releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes ironic-conductor missing mtools package.