diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-16 18:26:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-16 18:26:17 +0000 |
| commit | 0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e (patch) | |
| tree | 16c7723a691ee3fe293cd0d71996abceee14e994 /docker | |
| parent | f61135197d85ccdc300e685414d980a50e6698fa (diff) | |
| parent | a9f759d1dc23445c192c9f300275317fc372a8d5 (diff) | |
| download | kolla-0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e.tar.gz kolla-0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e.zip | |
Merge "Adds python3-systemd for ansible deploy interface" into stable/stein
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 1a4a41eb6..21cf20f1d 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -100,10 +100,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 %} @@ -117,6 +119,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-client', 'parted', 'psmisc', + 'python-systemd', 'qemu-utils', 'shellinabox', 'udev', |