summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Messerli <amesserl@rackspace.com>2020-01-30 08:16:18 -0600
committerMark Goddard <mark@stackhpc.com>2020-03-11 14:18:36 +0000
commita9f759d1dc23445c192c9f300275317fc372a8d5 (patch)
tree9f3c652fb68d293a13a6562570bb1b75dcd6e764
parentb12db74f59c5bcb1db03629a5f561186c5d32e8e (diff)
downloadkolla-a9f759d1dc23445c192c9f300275317fc372a8d5.tar.gz
kolla-a9f759d1dc23445c192c9f300275317fc372a8d5.zip
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 (cherry picked from commit 4a67e58f7971641c55247f02985e13ef391ca7ab)
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j23
-rw-r--r--releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml6
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ba62c50ec..385c64a4a 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -97,10 +97,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 %}
@@ -113,6 +115,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipmitool',
'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