diff options
| author | Zuul <zuul@review.opendev.org> | 2025-03-21 15:34:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-03-21 15:34:35 +0000 |
| commit | ad300f6daeb0a31358a8b8653cb7eb35f1a1c46b (patch) | |
| tree | 6a2ec12338555da2c34cf1ce38376d2ec6cf427c | |
| parent | 7a0c639da31a913edb52e877fc950a928994441c (diff) | |
| parent | d2837d8538a74cbcca391cff1279a2e47264c88d (diff) | |
| download | kolla-ad300f6daeb0a31358a8b8653cb7eb35f1a1c46b.tar.gz kolla-ad300f6daeb0a31358a8b8653cb7eb35f1a1c46b.zip | |
Merge "Add mtools package to ironic-conductor image"
| -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. |