From 856b2c8824967e582c3d2e98851b58efab6757f8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 24 Apr 2019 10:54:50 +0100
Subject: [PATCH] Install udevadm in ironic-conductor image

backport: rocky, queens

A dependency on udevadm was recently added to ironic-lib:

https://review.opendev.org/#/q/I9db48a3462422749290bbb887c14816734ab0478

Change-Id: I6c5746606ab59fd88e35525ecc17a62bfa9211e6
Closes-Bug: #1825784
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index b24ab79db0..b75ec8498a 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -76,6 +76,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-systemd',
             'qemu-utils',
             'shellinabox',
+            'udev',
             'xfsprogs',
         ] %}
     {% endif %}
@@ -94,6 +95,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'util-linux',
             'xfsprogs',
         ] %}
+        {% if distro_python_version.startswith('3') %}
+        {% set ironic_conductor_packages = ironic_conductor_packages + [
+            'systemd-udev',
+        ] %}
+        {% else %}
+        {% set ironic_conductor_packages = ironic_conductor_packages + [
+            'systemd',
+        ] %}
+        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set ironic_conductor_packages = [
             'bsdmainutils',
@@ -105,6 +115,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'psmisc',
             'qemu-utils',
             'shellinabox',
+            'udev',
             'xfsprogs',
         ] %}
     {% endif %}