From 4a67e58f7971641c55247f02985e13ef391ca7ab Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Thu, 30 Jan 2020 08:16:18 -0600
Subject: [PATCH] Adds python3-systemd for ansible deploy interface

When doing a source install, ironic doesn't have python3-systemd as a
dependency and the current ironic-conductor container doesn't install
the required dependencies which causes the ansible deploy interface to
fail with the error, "Systemd bindings do not exist".  This adds the
needed dependencies when doing a source build.  This installs the needed
files for both rpm and deb builds on python 2.x and 3.x.

Change-Id: I5d1bcb0f7d7902b4e122c12697483433bcf52ca2
Closes-Bug: #1861427
---
 docker/ironic/ironic-conductor/Dockerfile.j2                | 3 +++
 ...-python3-systemd-for-ironic-source-9a6883496e101da9.yaml | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ee154ce170..e5319e0691 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',
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 0000000000..c1ed377f2f
--- /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