openstack
/
kolla
Code Issues Proposed changes

Merge "Adds python3-systemd for ansible deploy interface" into stable/stein

This commit is contained in:
Zuul 2020-03-16 18:26:17 +00:00 committed by Gerrit Code Review
parent f61135197d a9f759d1dc
commit 0d20f1bf36
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,10 +100,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% if distro_python_version.startswith('3') %} {% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [ {% set ironic_conductor_packages = ironic_conductor_packages + [
'python3-systemd',
'systemd-udev', 'systemd-udev',
] %} ] %}
{% else %} {% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [ {% set ironic_conductor_packages = ironic_conductor_packages + [
'systemd-python',
'systemd', 'systemd',
] %} ] %}
{% endif %} {% endif %}
@ -117,6 +119,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssh-client', 'openssh-client',
'parted', 'parted',
'psmisc', 'psmisc',
'python-systemd',
'qemu-utils', 'qemu-utils',
'shellinabox', 'shellinabox',
'udev', 'udev',

6
releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Adds python3-systemd package to ironic-conductor source based
container to allow the Ansible deploy interface to function
correctly. Fixes bug #1861427