Skip to content

Commit 0d20f1b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Adds python3-systemd for ansible deploy interface" into stable/stein
2 parents f611351 + a9f759d commit 0d20f1b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

docker/ironic/ironic-conductor/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
100100
] %}
101101
{% if distro_python_version.startswith('3') %}
102102
{% set ironic_conductor_packages = ironic_conductor_packages + [
103+
'python3-systemd',
103104
'systemd-udev',
104105
] %}
105106
{% else %}
106107
{% set ironic_conductor_packages = ironic_conductor_packages + [
108+
'systemd-python',
107109
'systemd',
108110
] %}
109111
{% endif %}
@@ -117,6 +119,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
117119
'openssh-client',
118120
'parted',
119121
'psmisc',
122+
'python-systemd',
120123
'qemu-utils',
121124
'shellinabox',
122125
'udev',
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Adds python3-systemd package to ironic-conductor source based
5+
container to allow the Ansible deploy interface to function
6+
correctly. Fixes bug #1861427

0 commit comments

Comments
 (0)