diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-16 10:31:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-16 10:31:44 +0000 |
| commit | 22352f2b5b875bb0e42fb23f4e50bf0ff56ba5bd (patch) | |
| tree | 7d963d169206f94f42a1d4fdffc98546b1351209 /docker | |
| parent | 3470dc8199f36b2956b75bb2720cd73d207d8701 (diff) | |
| parent | b2a18a53423cde85e26c1611ae2b2a915b99bc3a (diff) | |
| download | kolla-22352f2b5b875bb0e42fb23f4e50bf0ff56ba5bd.tar.gz kolla-22352f2b5b875bb0e42fb23f4e50bf0ff56ba5bd.zip | |
Merge "Adds python3-systemd for ansible deploy interface" into stable/train
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 81460e581..096452b64 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -102,11 +102,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # by EPEL8. {% 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 + [ 'shellinabox', + 'systemd-python', 'systemd', ] %} {% endif %} @@ -129,6 +131,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-client', 'parted', 'psmisc', + 'python3-systemd', 'qemu-utils', 'shellinabox', 'udev', |