diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-25 12:39:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-25 12:39:39 +0000 |
| commit | 869adb8e802130e74cb04465e62813bce07b3a71 (patch) | |
| tree | ea79c552ead9c98902d91184ab3d7a62b3018f2c /docker | |
| parent | cbdce1eff79da7b62c4cbc16bea2b98226d01233 (diff) | |
| parent | 856b2c8824967e582c3d2e98851b58efab6757f8 (diff) | |
| download | kolla-869adb8e802130e74cb04465e62813bce07b3a71.tar.gz kolla-869adb8e802130e74cb04465e62813bce07b3a71.zip | |
Merge "Install udevadm in ironic-conductor image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 11 |
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 %} |