diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-31 02:05:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-31 02:05:38 +0000 |
| commit | f8c6762adeb171b6c4d8a670efc68c3575d0c2de (patch) | |
| tree | 3e399114b5095197dec5abfb06f03151c2d078f3 /docker | |
| parent | e97239f03e734195a49b383f0e77aae3bdea9a35 (diff) | |
| parent | 397651ec4b5b93a55d0b8b8f69dfb37dd85cfc8d (diff) | |
| download | kolla-f8c6762adeb171b6c4d8a670efc68c3575d0c2de.tar.gz kolla-f8c6762adeb171b6c4d8a670efc68c3575d0c2de.zip | |
Merge "CentOS 8: Remove shellinabox from ironic-conductor"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index dece02e25..ee154ce17 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -19,11 +19,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-ironic-staging-drivers', 'parted', 'psmisc', - 'shellinabox', 'util-linux', 'xfsprogs' ] %} + # FIXME(mgoddard): Removed shellinabox which is not currently provided + # by EPEL8. {% if distro_python_version.startswith('3') %} {% set ironic_conductor_packages = ironic_conductor_packages + [ 'python3dist\(ansible\)', @@ -46,6 +47,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-scciclient', 'python-sushy', 'python2-ImcSdk', + 'shellinabox', 'systemd-python' ] %} {% endif %} @@ -92,16 +94,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ipmitool', 'parted', 'psmisc', - 'shellinabox', 'util-linux', 'xfsprogs', ] %} + # FIXME(mgoddard): Removed shellinabox which is not currently provided + # by EPEL8. {% if distro_python_version.startswith('3') %} {% set ironic_conductor_packages = ironic_conductor_packages + [ 'systemd-udev', ] %} {% else %} {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'shellinabox', 'systemd', ] %} {% endif %} |