summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-04-29 14:18:01 +0000
committerGerrit Code Review <review@openstack.org>2019-04-29 14:18:01 +0000
commiteccd7bc1a7817be50c92bcd7881dd45718ab362d (patch)
tree41ab9675722c8e332c60b5b27c1a04d2bc52c36a /docker
parent10f0e55fd7df0fce2c737e7d47fb80d52abb883e (diff)
parent3e9b4406a499f395975992e016d03d60a6c61037 (diff)
downloadkolla-eccd7bc1a7817be50c92bcd7881dd45718ab362d.tar.gz
kolla-eccd7bc1a7817be50c92bcd7881dd45718ab362d.zip
Merge "Install udevadm in ironic-conductor image" into stable/stein
Diffstat (limited to 'docker')
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j211
1 files changed, 11 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index b24ab79db..b75ec8498 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 %}