diff options
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 0309a9dd4..d89dca66d 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/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 %} diff --git a/releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml b/releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml new file mode 100644 index 000000000..868bf745a --- /dev/null +++ b/releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes ironic-conductor missing mtools package. |