openstack/kolla
Code Issues Proposed changes

Merge "aarch64: Exclude syslinux from ironic conductor packages" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-10-03 21:34:54 +00:00 committed by Gerrit Code Review
commit 7eb2f9e9d9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -23,8 +23,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'util-linux', 'util-linux',
'xfsprogs', 'xfsprogs',
'genisoimage', 'genisoimage',
'syslinux',
] %} ] %}
{% if base_arch in ['x86_64'] %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'syslinux'
] %}
{% endif %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',