diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-16 18:26:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-16 18:26:17 +0000 |
| commit | 0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e (patch) | |
| tree | 16c7723a691ee3fe293cd0d71996abceee14e994 | |
| parent | f61135197d85ccdc300e685414d980a50e6698fa (diff) | |
| parent | a9f759d1dc23445c192c9f300275317fc372a8d5 (diff) | |
| download | kolla-0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e.tar.gz kolla-0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e.zip | |
Merge "Adds python3-systemd for ansible deploy interface" into stable/stein
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 1a4a41eb6..21cf20f1d 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -100,10 +100,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% 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 + [ + 'systemd-python', 'systemd', ] %} {% endif %} @@ -117,6 +119,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-client', 'parted', 'psmisc', + 'python-systemd', 'qemu-utils', 'shellinabox', 'udev', diff --git a/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml b/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml new file mode 100644 index 000000000..c1ed377f2 --- /dev/null +++ b/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml @@ -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 |