summaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-04 15:26:23 +0000
committerGerrit Code Review <review@openstack.org>2020-02-04 15:26:23 +0000
commit481636bc6dd6880dbc328d0bafc485dfebdabc7a (patch)
tree06d77ac18cec8f82b7ddba28f591f6746ca12dad /docker/ironic
parenta0058693f192d866a54a21137424b9a67ae8ef4c (diff)
parent4a67e58f7971641c55247f02985e13ef391ca7ab (diff)
downloadkolla-481636bc6dd6880dbc328d0bafc485dfebdabc7a.tar.gz
kolla-481636bc6dd6880dbc328d0bafc485dfebdabc7a.zip
Merge "Adds python3-systemd for ansible deploy interface"
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ee154ce17..e5319e069 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -101,11 +101,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# by EPEL8.
{% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
+ 'python3-systemd',
'systemd-udev',
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'shellinabox',
+ 'systemd-python',
'systemd',
] %}
{% endif %}
@@ -127,6 +129,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipmitool',
'parted',
'psmisc',
+ 'python3-systemd',
'qemu-utils',
'shellinabox',
'udev',