openstack
/
kolla
Code Issues Proposed changes

Merge "Install udevadm in ironic-conductor image"

This commit is contained in:
Zuul 2019-04-25 12:39:39 +00:00 committed by Gerrit Code Review
parent cbdce1eff7 856b2c8824
commit 869adb8e80
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-systemd',
'qemu-utils',
'shellinabox',
'udev',
'xfsprogs',
] %}
{% endif %}
@ -94,6 +95,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'util-linux',
'xfsprogs',
] %}
{% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'systemd-udev',
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'systemd',
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [
'bsdmainutils',
@ -105,6 +115,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'psmisc',
'qemu-utils',
'shellinabox',
'udev',
'xfsprogs',
] %}
{% endif %}